From 84f8e058cc3c854503e3eb3d2de13fb2bdccf247 Mon Sep 17 00:00:00 2001
From: Austin Cory Bart <acbart@vt.edu>
Date: Fri, 3 Apr 2020 14:24:11 -0400
Subject: [PATCH] Toolbar updates

---
 .idea/inspectionProfiles/Project_Default.xml |  12 +
 .idea/markdown-navigator-enh.xml             |  29 ++
 .idea/markdown-navigator.xml                 |  55 +++
 .idea/workspace.xml                          |  72 +++-
 dist/block_mirror.js                         | 216 ++++++++++--
 src/block_editor.js                          |  27 ++
 src/block_mirror.js                          |   7 +-
 src/text_to_blocks.js                        |  15 +-
 src/toolbars.js                              | 351 ++++++++++++++-----
 9 files changed, 637 insertions(+), 147 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/markdown-navigator-enh.xml
 create mode 100644 .idea/markdown-navigator.xml

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..06bb031
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,12 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N802" />
+        </list>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
new file mode 100644
index 0000000..12fb99d
--- /dev/null
+++ b/.idea/markdown-navigator-enh.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownEnhProjectSettings">
+    <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+  <component name="MarkdownNavigatorHistory">
+    <PasteImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </PasteImageHistory>
+    <CopyImageHistory checkeredTransparentBackground="false" filename="image" directory="" onPasteImageTargetRef="3" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteReferenceElement="2" cornerRadius="20" borderColor="0" transparentColor="16777215" borderWidth="1" trimTop="0" trimBottom="0" trimLeft="0" trimRight="0" transparent="false" roundCorners="false" showPreview="true" bordered="false" scaled="false" cropped="false" hideInapplicableOperations="false" preserveLinkFormat="false" scale="50" scalingInterpolation="1" transparentTolerance="0" saveAsDefaultOnOK="false" linkFormat="0" addHighlights="false" showHighlightCoordinates="true" showHighlights="false" mouseSelectionAddsHighlight="false" outerFilled="false" outerFillColor="0" outerFillTransparent="true" outerFillAlpha="30">
+      <highlightList />
+      <directories />
+      <filenames />
+    </CopyImageHistory>
+    <PasteLinkHistory onPasteImageTargetRef="3" onPasteTargetRef="1" onPasteLinkText="0" onPasteImageElement="1" onPasteLinkElement="1" onPasteWikiElement="2" onPasteReferenceElement="2" hideInapplicableOperations="false" preserveLinkFormat="false" useHeadingForLinkText="false" linkFormat="0" saveAsDefaultOnOK="false" />
+    <TableToJsonHistory>
+      <entries />
+    </TableToJsonHistory>
+    <TableSortHistory>
+      <entries />
+    </TableSortHistory>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..d6df267
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="FlexmarkProjectSettings">
+    <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
+      <flexmarkSectionLanguages>
+        <option name="1" value="Markdown" />
+        <option name="2" value="HTML" />
+        <option name="3" value="flexmark-ast:1" />
+      </flexmarkSectionLanguages>
+    </FlexmarkHtmlSettings>
+  </component>
+  <component name="MarkdownProjectSettings">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" synchronizePreviewPosition="true" highlightPreviewType="LINE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" correctedInvalidSettings="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="INTELLIJ_DUMMY_IDENTIFIER" value="true" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="PRODUCTION_SPEC_PARSER" value="true" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.text.html.generator" providerName="Unmodified HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.text.html.css" providerName="No Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fe49fed..6874d64 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,11 @@
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="Basics of packaging, bug fixes, better updating">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/block_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_editor.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/text_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_editor.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/text_to_blocks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_to_blocks.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/toolbars.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/toolbars.js" afterDir="false" />
     </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -43,13 +43,18 @@
   </component>
   <component name="ProjectId" id="1OR0VFaxkOvFIyHle2nZjV999OR" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showExcludedFiles" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="full.screen.before.presentation.mode" value="false" />
     <property name="javascript.nodejs.core.library.configured.version" value="10.16.0" />
     <property name="jsx.switch.disabled" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/ast" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -67,19 +72,13 @@
       <recent name="C:\Users\acbart\Projects\blockpy-edu\BlockMirror\src\ast" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="RunManager" selected="npm.devbuild">
+    <configuration name="simple_dev.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/BlockMirror/test/simple_dev.html" useBuiltInWebServerPort="true">
+      <method v="2" />
+    </configuration>
+    <configuration name="simple.html" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/BlockMirror/test/simple.html" useBuiltInWebServerPort="true">
+      <method v="2" />
+    </configuration>
     <configuration name="webpack.config.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="webpack.config.js" working-dir="$PROJECT_DIR$">
       <method v="2" />
     </configuration>
@@ -104,6 +103,8 @@
       <method v="2" />
     </configuration>
     <list>
+      <item itemvalue="JavaScript Debug.simple.html" />
+      <item itemvalue="JavaScript Debug.simple_dev.html" />
       <item itemvalue="Node.js.webpack.config.js" />
       <item itemvalue="npm.build" />
       <item itemvalue="npm.devbuild" />
@@ -111,8 +112,9 @@
     <recent_temporary>
       <list>
         <item itemvalue="npm.devbuild" />
+        <item itemvalue="JavaScript Debug.simple_dev.html" />
+        <item itemvalue="JavaScript Debug.simple.html" />
         <item itemvalue="npm.build" />
-        <item itemvalue="Node.js.webpack.config.js" />
       </list>
     </recent_temporary>
   </component>
@@ -170,6 +172,18 @@
       <workItem from="1568400256383" duration="603000" />
       <workItem from="1568432956949" duration="2302000" />
       <workItem from="1568665354474" duration="1573000" />
+      <workItem from="1572464200305" duration="751000" />
+      <workItem from="1572827583856" duration="5884000" />
+      <workItem from="1573425794486" duration="2367000" />
+      <workItem from="1575315779702" duration="608000" />
+      <workItem from="1575553290520" duration="2962000" />
+      <workItem from="1575728911099" duration="573000" />
+      <workItem from="1575775946485" duration="246000" />
+      <workItem from="1581299520410" duration="907000" />
+      <workItem from="1581747741338" duration="1226000" />
+      <workItem from="1581787835886" duration="30000" />
+      <workItem from="1581787894709" duration="8205000" />
+      <workItem from="1582172961284" duration="310000" />
     </task>
     <task id="LOCAL-00001" summary="Basics of packaging, bug fixes, better updating">
       <created>1564063805490</created>
@@ -201,6 +215,32 @@
     <MESSAGE value="Basics of packaging, bug fixes, better updating" />
     <option name="LAST_COMMIT_MESSAGE" value="Basics of packaging, bug fixes, better updating" />
   </component>
+  <component name="WindowStateProjectService">
+    <state width="1238" height="95" key="GridCell.Tab.0.bottom" timestamp="1582173273392">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="1238" height="95" key="GridCell.Tab.0.bottom/0.0.1280.680@0.0.1280.680" timestamp="1582173273392" />
+    <state width="1238" height="95" key="GridCell.Tab.0.center" timestamp="1582173273391">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="1238" height="95" key="GridCell.Tab.0.center/0.0.1280.680@0.0.1280.680" timestamp="1582173273391" />
+    <state width="1238" height="95" key="GridCell.Tab.0.left" timestamp="1582173273391">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="1238" height="95" key="GridCell.Tab.0.left/0.0.1280.680@0.0.1280.680" timestamp="1582173273391" />
+    <state width="1238" height="95" key="GridCell.Tab.0.right" timestamp="1582173273391">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state width="1238" height="95" key="GridCell.Tab.0.right/0.0.1280.680@0.0.1280.680" timestamp="1582173273391" />
+    <state x="348" y="169" key="com.intellij.ide.util.TipDialog" timestamp="1581787914659">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="348" y="169" key="com.intellij.ide.util.TipDialog/0.0.1280.680@0.0.1280.680" timestamp="1581787914659" />
+    <state x="303" y="2" width="672" height="678" key="search.everywhere.popup" timestamp="1581790768009">
+      <screen x="0" y="0" width="1280" height="680" />
+    </state>
+    <state x="303" y="2" width="672" height="678" key="search.everywhere.popup/0.0.1280.680@0.0.1280.680" timestamp="1581790768009" />
+  </component>
   <component name="masterDetails">
     <states>
       <state key="ScopeChooserConfigurable.UI">
diff --git a/dist/block_mirror.js b/dist/block_mirror.js
index 5c90249..12c93f8 100644
--- a/dist/block_mirror.js
+++ b/dist/block_mirror.js
@@ -172,14 +172,14 @@ Blockly.Variables.flyoutCategoryBlocks = function (workspace) {
 function BlockMirror(configuration) {
   this.validateConfiguration(configuration);
   this.initializeVariables();
-  this.textEditor = new BlockMirrorTextEditor(this);
-  this.blockEditor = new BlockMirrorBlockEditor(this);
-  this.textToBlocks = new BlockMirrorTextToBlocks(this);
 
   if (!this.configuration.skipSkulpt) {
     this.loadSkulpt();
   }
 
+  this.textToBlocks = new BlockMirrorTextToBlocks(this);
+  this.textEditor = new BlockMirrorTextEditor(this);
+  this.blockEditor = new BlockMirrorBlockEditor(this);
   this.setMode(this.configuration.viewMode);
 }
 
@@ -725,12 +725,45 @@ BlockMirrorBlockEditor.prototype.resized = function (e) {
   this.resizeReadOnlyDiv();
 };
 
+BlockMirrorBlockEditor.prototype.toolboxPythonToBlocks = function (toolboxPython) {
+  var _this4 = this;
+
+  return toolboxPython.map(function (category) {
+    if (typeof category === "string") {
+      return category;
+    }
+
+    var colour = BlockMirrorTextToBlocks.COLOR[category.colour];
+    var header = "<category name=\"".concat(category.name, "\" colour=\"").concat(colour, "\"");
+
+    if (category.custom) {
+      header += " custom=\"".concat(category.custom, "\">");
+    } else {
+      header += ">";
+    }
+
+    var body = (category.blocks || []).map(function (code) {
+      var result = _this4.blockMirror.textToBlocks.convertSource('toolbox.py', code);
+
+      return result.rawXml.innerHTML.toString();
+    }).join("\n");
+    var footer = "</category>";
+    return [header, body, footer].join("\n");
+  }).join("\n");
+};
+
 BlockMirrorBlockEditor.prototype.makeToolbox = function () {
-  var toolbox = this.blockMirror.configuration.toolbox;
+  var toolbox = this.blockMirror.configuration.toolbox; // Use palette if it exists, otherwise assume its a custom one.
 
   if (toolbox in this.TOOLBOXES) {
     toolbox = this.TOOLBOXES[toolbox];
-  }
+  } // Convert if necessary
+
+
+  if (typeof toolbox !== "string") {
+    toolbox = this.toolboxPythonToBlocks(toolbox);
+  } // TODO: Fix Hack, this should be configurable by instance rather than by class
+
 
   for (var name in BlockMirrorBlockEditor.EXTRA_TOOLS) {
     toolbox += BlockMirrorBlockEditor.EXTRA_TOOLS[name];
@@ -1025,7 +1058,8 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
     if (python_source.trim() === "") {
       return {
         "xml": BlockMirrorTextToBlocks.xmlToString(xml),
-        "error": null
+        "error": null,
+        rawXml: xml
       };
     }
 
@@ -1045,7 +1079,8 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
         xml.appendChild(BlockMirrorTextToBlocks.raw_block(originalSource));
         return {
           "xml": BlockMirrorTextToBlocks.xmlToString(xml),
-          "error": error
+          "error": error,
+          "rawXml": xml
         };
       }
     }
@@ -1079,7 +1114,8 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
     "xml": BlockMirrorTextToBlocks.xmlToString(xml),
     "error": null,
     "lineMap": this.lineMap,
-    'comments': this.comments
+    'comments': this.comments,
+    "rawXml": xml
   };
 };
 
@@ -1091,7 +1127,7 @@ BlockMirrorTextToBlocks.prototype.recursiveMeasure = function (node, nextBlockLi
   var myNext = nextBlockLine;
 
   if ("orelse" in node && node.orelse.length > 0) {
-    if (node.orelse.length == 1 && node.orelse[0]._astname == "If") {
+    if (node.orelse.length === 1 && node.orelse[0]._astname === "If") {
       myNext = node.orelse[0].lineno - 1;
     } else {
       myNext = node.orelse[0].lineno - 1 - 1;
@@ -2380,30 +2416,150 @@ var ZERO_BLOCK = BlockMirrorTextToBlocks.create_block('ast_Num', null, {
   'NUM': 0
 });
 BlockMirrorBlockEditor.EXTRA_TOOLS = {};
-
-BlockMirrorBlockEditor.getDefaultBlocks = function () {
-  return "<category name=\"Variables\" custom=\"VARIABLE\" colour=\"".concat(BlockMirrorTextToBlocks.COLOR.VARIABLES, "\"></category>\n        <category name=\"Decisions\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.LOGIC, "\">\n            <block type=\"ast_If\"></block>\n            <block type=\"ast_If\"><mutation orelse=\"true\"></mutation></block>\n            <block type=\"ast_Compare\"></block>\n            <block type=\"ast_BoolOp\"></block>\n            <block type=\"ast_UnaryOpNot\"></block>\n        </category>\n        <category name=\"Iteration\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.CONTROL, "\">\n            <block type=\"ast_For\"></block>        \n        </category>\n        <sep></sep>\n        <category name=\"Calculation\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.MATH, "\">\n            <block type=\"ast_BinOp\"></block>\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("round"), "\n        </category>\n        <category name=\"Output\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.PLOTTING, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("print"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("plot", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("scatter", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("hist", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("show", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("title", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("xlabel", {}, "plt"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("ylabel", {}, "plt"), "\n        </category>\n        <category name=\"Input\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("input"), "\n        </category>\n        <sep></sep>\n        <category name=\"Values\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            <block type=\"ast_Str\"></block>\n            <block type=\"ast_Num\"></block>\n            <block type=\"ast_NameConstantBoolean\"></block>\n        </category>\n        <category name=\"Conversion\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.TEXT, "\">\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("int"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("float"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("str"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("bool"), "\n        </category>\n        <category name=\"Lists\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.LIST, "\">\n            <block type=\"ast_List\"><mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n                <value name=\"ADD1\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n                <value name=\"ADD2\"><block type=\"ast_Num\"><field name=\"NUM\">0</field></block></value>\n            </block>\n            <block type=\"ast_List\"><mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"></value>\n                <value name=\"ADD1\"></value>\n                <value name=\"ADD2\"></value>\n            </block>\n            <block type=\"ast_List\"><mutation items=\"0\"></mutation></block>\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock(".append"), "\n            ").concat(BlockMirrorTextToBlocks.getFunctionBlock("range", {
-    'ARG0': ZERO_BLOCK
-  }), "\n        </category>\n        <category name=\"Dictionaries\" colour=\"").concat(BlockMirrorTextToBlocks.COLOR.DICTIONARY, "\">\n            <block type=\"ast_Dict\">\n                <mutation items=\"3\"></mutation>\n                <value name=\"ADD0\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">1st key</field></block></value>\n                </block></value>\n                <value name=\"ADD1\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">2nd key</field></block></value>\n                </block></value>\n                <value name=\"ADD2\"><block type=\"ast_DictItem\" deletable=\"false\" movable=\"false\">\n                    <value name=\"KEY\"><block type=\"ast_Str\"><field name=\"TEXT\">3rd key</field></block></value>\n                </block></value>\n            </block>\n            <block type=\"ast_Subscript\">\n                <mutation><arg name=\"I\"></arg></mutation>\n                <value name=\"INDEX0\"><block type=\"ast_Str\"><field name=\"TEXT\">key</field></block></value>\n            </block>\n        </category>\n        <sep></sep>");
+var TOOLBOX_CATEGORY = {};
+TOOLBOX_CATEGORY.VARIABLES = {
+  name: 'Variables',
+  colour: 'VARIABLES',
+  custom: 'VARIABLE'
+};
+TOOLBOX_CATEGORY.DECISIONS = {
+  name: "Decisions",
+  colour: "LOGIC",
+  blocks: ['if ___: pass', 'if ___: pass\nelse: pass', '___ < ___', '___ and ___', 'not ___']
+};
+TOOLBOX_CATEGORY.CALCULATIONS = {
+  name: "Calculation",
+  colour: "MATH",
+  blocks: ["___ + ___", "round(___)"]
+};
+TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING = {
+  name: "Output",
+  colour: "PLOTTING",
+  blocks: ["print(___)", "plt.plot(___)", "plt.scatter(___, ___)", "plt.hist(___)", "plt.show()", "plt.title(___)", "plt.xlabel(___)", "plt.ylabel(___)"]
+};
+TOOLBOX_CATEGORY.TURTLES = {
+  name: "Turtles",
+  colour: "PLOTTING",
+  blocks: ["turtle.mainloop()", "turtle.forward(50)", "turtle.backward(50)", "turtle.right(90)", "turtle.left(90)", "turtle.goto(0, 0)", "turtle.setx(100)", "turtle.sety(100)", "turtle.setheading(270)", "turtle.pendown()", "turtle.penup()", "turtle.pencolor('blue')"]
+};
+TOOLBOX_CATEGORY.INPUT = {
+  name: "Input",
+  colour: "TEXT",
+  blocks: ["input(___)"]
+};
+TOOLBOX_CATEGORY.VALUES = {
+  name: "Values",
+  colour: "TEXT",
+  blocks: ['""', "0", "True"]
+};
+TOOLBOX_CATEGORY.SEP = "<sep></sep>";
+TOOLBOX_CATEGORY.CONVERSIONS = {
+  name: "Conversion",
+  colour: "TEXT",
+  blocks: ["int(___)", "float(___)", "str(___)", "bool(___)"]
+};
+TOOLBOX_CATEGORY.DICTIONARIES = {
+  name: "Dictionaries",
+  colour: "DICTIONARY",
+  blocks: ["{'1st key': ___, '2nd key': ___, '3rd key': ___}", "{}", "___['key']"]
 };
-
 BlockMirrorBlockEditor.prototype.TOOLBOXES = {
-  'normal': BlockMirrorBlockEditor.getDefaultBlocks()
-}; // TODO: fix these to be more interesting
-
-BlockMirrorBlockEditor.prototype.TOOLBOXES['minimal'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
-BlockMirrorBlockEditor.prototype.TOOLBOXES['full'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
-/*
-xml += '<category name="Iteration" colour="300">' +
-
-    '<block type="ast_ForElse"></block>' +
-    '</category>';
-xml += '<category name="Values" colour="300">' +
-    '<block type="ast_Num"></block>' +
-    '</category>';
-//xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
-xml += '</xml>';*/
+  //******************************************************
+  'minimal': [// TODO: What should live in here?
+  TOOLBOX_CATEGORY.VARIABLES],
+  //******************************************************
+  'normal': [TOOLBOX_CATEGORY.VARIABLES, TOOLBOX_CATEGORY.DECISIONS, {
+    name: "Iteration",
+    colour: "CONTROL",
+    blocks: ['for ___ in ___: pass', 'while ___: pass', 'break']
+  }, {
+    name: "Functions",
+    colour: "FUNCTIONS",
+    blocks: ["def ___(___): pass", "def ___(___: int)->str: pass", "return ___"]
+  }, TOOLBOX_CATEGORY.SEP, TOOLBOX_CATEGORY.CALCULATIONS, TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING, TOOLBOX_CATEGORY.INPUT, TOOLBOX_CATEGORY.TURTLES, TOOLBOX_CATEGORY.SEP, TOOLBOX_CATEGORY.VALUES, TOOLBOX_CATEGORY.CONVERSIONS, {
+    name: "Lists",
+    colour: "LIST",
+    blocks: ["[0, 0, 0]", "[___, ___, ___]", "[]", "___.append(___)", "range(0, 10)"]
+  }, TOOLBOX_CATEGORY.DICTIONARIES],
+  //******************************************************
+  'ct': [TOOLBOX_CATEGORY.VARIABLES, TOOLBOX_CATEGORY.DECISIONS, {
+    name: "Iteration",
+    colour: "CONTROL",
+    blocks: ['for ___ in ___: pass']
+  }, TOOLBOX_CATEGORY.SEP, TOOLBOX_CATEGORY.CALCULATIONS, TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING, TOOLBOX_CATEGORY.INPUT, TOOLBOX_CATEGORY.SEP, TOOLBOX_CATEGORY.VALUES, TOOLBOX_CATEGORY.CONVERSIONS, {
+    name: "Lists",
+    colour: "LIST",
+    blocks: ["[0, 0, 0]", "[___, ___, ___]", "[]", "___.append(___)"]
+  }],
+  //******************************************************
+  'full': [TOOLBOX_CATEGORY.VARIABLES, {
+    name: "Literal Values",
+    colour: "LIST",
+    blocks: ["0", "''", "True", "None", "[___, ___, ___]", "(___, ___, ___)", "{___, ___, ___}", "{___: ___, ___: ___, ___: ___}"]
+  }, {
+    name: "Calculations",
+    colour: "MATH",
+    blocks: ["-___", "___ + ___", "___ >> ___", "abs(___)", "round(___)"]
+  }, {
+    name: "Logic",
+    colour: "LOGIC",
+    blocks: ['___ if ___ else ___', '___ == ___', '___ < ___', '___ in ___', '___ and ___', 'not ___']
+  }, TOOLBOX_CATEGORY.SEP, {
+    name: "Classes",
+    colour: "OO",
+    blocks: ["class ___: pass", "class ___(___): pass", "___.___", "___: ___", "super()"]
+  }, {
+    name: "Functions",
+    colour: "FUNCTIONS",
+    blocks: ["def ___(___): pass", "def ___(___: int)->str: pass", "return ___", "yield ___", "lambda ___: ___"]
+  }, {
+    name: "Imports",
+    colour: "PYTHON",
+    blocks: ["import ___", "from ___ import ___", "import ___ as ___", "from ___ import ___ as ___"]
+  }, TOOLBOX_CATEGORY.SEP, {
+    name: "Control Flow",
+    colour: "CONTROL",
+    blocks: ['if ___: pass', 'if ___: pass\nelse: pass', 'for ___ in ___: pass', 'while ___: pass', 'break', 'continue', 'try: pass\nexcept ___ as ___: pass', 'raise ___', 'assert ___', 'with ___ as ___: pass']
+  }, TOOLBOX_CATEGORY.SEP, TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING, TOOLBOX_CATEGORY.INPUT, {
+    name: "Files",
+    colour: "FILE",
+    blocks: ["with open('', 'r') as ___: pass", "___.read()", "___.readlines()", "___.write(___)", "___.writelines(___)"]
+  }, TOOLBOX_CATEGORY.SEP, {
+    name: "Conversion",
+    colour: "TEXT",
+    blocks: ["int(___)", "float(___)", "str(___)", "chr(___)", "bool(___)", "list(___)", "dict(___)", "tuple(___)", "set(___)", "type(___)", "isinstance(___)"]
+  }, {
+    name: "Builtin Functions",
+    colour: "SEQUENCES",
+    blocks: ["len(___)", "sorted(___)", "enumerate(___)", "reversed(___)", "range(0, 10)", "min(___, ___)", "max(___, ___)", "sum(___)", "all(___)", "any(___)", "zip(___, ___)", "map(___, ___)", "filter(___, ___)"]
+  }, {
+    name: "List Methods",
+    colour: "LIST",
+    blocks: ["___.append(___)", "___.pop()", "___.clear()"]
+  }, {
+    name: "String Methods",
+    colour: "TEXT",
+    blocks: ["___.startswith('')", "___.endswith('')", "___.replace('', '')", "___.lower('')", "___.upper('')", "___.title('')", "___.strip('')", "___.split('')", "''.join(___)", "___.format('')", "___.strip('')"]
+  }, {
+    name: "Subscripting",
+    colour: "SEQUENCES",
+    blocks: ["___[___]", "___[___:___]", "___[___:___:___]"]
+  }, {
+    name: "Generators",
+    colour: "SEQUENCES",
+    blocks: ["[___ for ___ in ___]", "(___ for ___ in ___)", "{___ for ___ in ___}", "{___: ___ for ___ in ___ if ___}", "[___ for ___ in ___ if ___]", "(___ for ___ in ___ if ___)", "{___ for ___ in ___ if ___}", "{___: ___ for ___ in ___ if ___}"]
+  }, {
+    name: "Comments",
+    colour: "PYTHON",
+    blocks: ["# ", '"""\n"""']
+    /*,
+    {name: "Weird Stuff", colour: "PYTHON", blocks: [
+      "delete ___",
+      "global ___"
+    ]}*/
 
+  }]
+};
 BlockMirrorTextToBlocks.BLOCKS.push({
   "type": "ast_For",
   "message0": "for each item %1 in list %2 : %3 %4",
diff --git a/src/block_editor.js b/src/block_editor.js
index f344bfa..06bbe8d 100644
--- a/src/block_editor.js
+++ b/src/block_editor.js
@@ -112,11 +112,38 @@ BlockMirrorBlockEditor.prototype.resized = function (e) {
     this.resizeReadOnlyDiv();
 };
 
+BlockMirrorBlockEditor.prototype.toolboxPythonToBlocks = function (toolboxPython) {
+    return toolboxPython.map((category) => {
+        if (typeof category === "string") {
+            return category;
+        }
+        let colour = BlockMirrorTextToBlocks.COLOR[category.colour];
+        let header = `<category name="${category.name}" colour="${colour}"`;
+        if (category.custom) {
+            header += ` custom="${category.custom}">`;
+        } else {
+            header += ">";
+        }
+        let body = (category.blocks || []).map((code) => {
+            let result = this.blockMirror.textToBlocks.convertSource('toolbox.py', code);
+            return result.rawXml.innerHTML.toString();
+        }).join("\n");
+        let footer = "</category>";
+        return [header, body, footer].join("\n");
+    }).join("\n");
+};
+
 BlockMirrorBlockEditor.prototype.makeToolbox = function () {
     let toolbox = this.blockMirror.configuration.toolbox;
+    // Use palette if it exists, otherwise assume its a custom one.
     if (toolbox in this.TOOLBOXES) {
         toolbox = this.TOOLBOXES[toolbox];
     }
+    // Convert if necessary
+    if (typeof toolbox  !== "string") {
+        toolbox = this.toolboxPythonToBlocks(toolbox);
+    }
+    // TODO: Fix Hack, this should be configurable by instance rather than by class
     for (let name in BlockMirrorBlockEditor.EXTRA_TOOLS) {
         toolbox += BlockMirrorBlockEditor.EXTRA_TOOLS[name];
     }
diff --git a/src/block_mirror.js b/src/block_mirror.js
index 4bae3bc..46d488d 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -32,14 +32,15 @@
 function BlockMirror(configuration) {
     this.validateConfiguration(configuration);
     this.initializeVariables();
-    this.textEditor = new BlockMirrorTextEditor(this);
-    this.blockEditor = new BlockMirrorBlockEditor(this);
-    this.textToBlocks = new BlockMirrorTextToBlocks(this);
 
     if (!this.configuration.skipSkulpt) {
         this.loadSkulpt();
     }
 
+    this.textToBlocks = new BlockMirrorTextToBlocks(this);
+    this.textEditor = new BlockMirrorTextEditor(this);
+    this.blockEditor = new BlockMirrorBlockEditor(this);
+
     this.setMode(this.configuration.viewMode);
 };
 
diff --git a/src/text_to_blocks.js b/src/text_to_blocks.js
index d36550d..f74be7d 100644
--- a/src/text_to_blocks.js
+++ b/src/text_to_blocks.js
@@ -35,7 +35,7 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
     let previousLine = 1+this.source.length;
     while (ast === null) {
         if (python_source.trim() === "") {
-            return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null};
+            return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null, rawXml: xml};
         }
         try {
             parse = Sk.parse(filename, python_source);
@@ -51,7 +51,7 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
             } else {
                 //console.error(e);
                 xml.appendChild(BlockMirrorTextToBlocks.raw_block(originalSource));
-                return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": error};
+                return {"xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": error, "rawXml": xml};
             }
         }
     }
@@ -75,10 +75,13 @@ BlockMirrorTextToBlocks.prototype.convertSource = function (filename, python_sou
         xml.appendChild(BlockMirrorTextToBlocks.raw_block(badChunks.join("\n")));
     }
     return {
-        "xml": BlockMirrorTextToBlocks.xmlToString(xml), "error": null,
-        "lineMap": this.lineMap, 'comments': this.comments
+        "xml": BlockMirrorTextToBlocks.xmlToString(xml),
+        "error": null,
+        "lineMap": this.lineMap,
+        'comments': this.comments,
+        "rawXml": xml
     };
-}
+};
 
 BlockMirrorTextToBlocks.prototype.recursiveMeasure = function (node, nextBlockLine) {
     if (node === undefined) {
@@ -86,7 +89,7 @@ BlockMirrorTextToBlocks.prototype.recursiveMeasure = function (node, nextBlockLi
     }
     var myNext = nextBlockLine;
     if ("orelse" in node && node.orelse.length > 0) {
-        if (node.orelse.length == 1 && node.orelse[0]._astname == "If") {
+        if (node.orelse.length === 1 && node.orelse[0]._astname === "If") {
             myNext = node.orelse[0].lineno - 1;
         } else {
             myNext = node.orelse[0].lineno - 1 - 1;
diff --git a/src/toolbars.js b/src/toolbars.js
index 6583777..1e3b947 100644
--- a/src/toolbars.js
+++ b/src/toolbars.js
@@ -2,99 +2,266 @@ let ZERO_BLOCK = BlockMirrorTextToBlocks.create_block('ast_Num', null, {'NUM': 0
 
 BlockMirrorBlockEditor.EXTRA_TOOLS = {};
 
-BlockMirrorBlockEditor.getDefaultBlocks = function () {
-    return `<category name="Variables" custom="VARIABLE" colour="${BlockMirrorTextToBlocks.COLOR.VARIABLES}"></category>
-        <category name="Decisions" colour="${BlockMirrorTextToBlocks.COLOR.LOGIC}">
-            <block type="ast_If"></block>
-            <block type="ast_If"><mutation orelse="true"></mutation></block>
-            <block type="ast_Compare"></block>
-            <block type="ast_BoolOp"></block>
-            <block type="ast_UnaryOpNot"></block>
-        </category>
-        <category name="Iteration" colour="${BlockMirrorTextToBlocks.COLOR.CONTROL}">
-            <block type="ast_For"></block>        
-        </category>
-        <sep></sep>
-        <category name="Calculation" colour="${BlockMirrorTextToBlocks.COLOR.MATH}">
-            <block type="ast_BinOp"></block>
-            ${BlockMirrorTextToBlocks.getFunctionBlock("round")}
-        </category>
-        <category name="Output" colour="${BlockMirrorTextToBlocks.COLOR.PLOTTING}">
-            ${BlockMirrorTextToBlocks.getFunctionBlock("print")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("plot", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("scatter", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("hist", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("show", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("title", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("xlabel", {}, "plt")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("ylabel", {}, "plt")}
-        </category>
-        <category name="Input" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
-            ${BlockMirrorTextToBlocks.getFunctionBlock("input")}
-        </category>
-        <sep></sep>
-        <category name="Values" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
-            <block type="ast_Str"></block>
-            <block type="ast_Num"></block>
-            <block type="ast_NameConstantBoolean"></block>
-        </category>
-        <category name="Conversion" colour="${BlockMirrorTextToBlocks.COLOR.TEXT}">
-            ${BlockMirrorTextToBlocks.getFunctionBlock("int")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("float")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("str")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("bool")}
-        </category>
-        <category name="Lists" colour="${BlockMirrorTextToBlocks.COLOR.LIST}">
-            <block type="ast_List"><mutation items="3"></mutation>
-                <value name="ADD0"><block type="ast_Num"><field name="NUM">0</field></block></value>
-                <value name="ADD1"><block type="ast_Num"><field name="NUM">0</field></block></value>
-                <value name="ADD2"><block type="ast_Num"><field name="NUM">0</field></block></value>
-            </block>
-            <block type="ast_List"><mutation items="3"></mutation>
-                <value name="ADD0"></value>
-                <value name="ADD1"></value>
-                <value name="ADD2"></value>
-            </block>
-            <block type="ast_List"><mutation items="0"></mutation></block>
-            ${BlockMirrorTextToBlocks.getFunctionBlock(".append")}
-            ${BlockMirrorTextToBlocks.getFunctionBlock("range", {'ARG0': ZERO_BLOCK})}
-        </category>
-        <category name="Dictionaries" colour="${BlockMirrorTextToBlocks.COLOR.DICTIONARY}">
-            <block type="ast_Dict">
-                <mutation items="3"></mutation>
-                <value name="ADD0"><block type="ast_DictItem" deletable="false" movable="false">
-                    <value name="KEY"><block type="ast_Str"><field name="TEXT">1st key</field></block></value>
-                </block></value>
-                <value name="ADD1"><block type="ast_DictItem" deletable="false" movable="false">
-                    <value name="KEY"><block type="ast_Str"><field name="TEXT">2nd key</field></block></value>
-                </block></value>
-                <value name="ADD2"><block type="ast_DictItem" deletable="false" movable="false">
-                    <value name="KEY"><block type="ast_Str"><field name="TEXT">3rd key</field></block></value>
-                </block></value>
-            </block>
-            <block type="ast_Subscript">
-                <mutation><arg name="I"></arg></mutation>
-                <value name="INDEX0"><block type="ast_Str"><field name="TEXT">key</field></block></value>
-            </block>
-        </category>
-        <sep></sep>`;
-}
+const TOOLBOX_CATEGORY = {};
 
-BlockMirrorBlockEditor.prototype.TOOLBOXES = {
-    'normal': BlockMirrorBlockEditor.getDefaultBlocks(),
-};
+TOOLBOX_CATEGORY.VARIABLES = {name: 'Variables', colour: 'VARIABLES', custom: 'VARIABLE'};
+TOOLBOX_CATEGORY.DECISIONS = {name: "Decisions", colour: "LOGIC", blocks: [
+    'if ___: pass',
+    'if ___: pass\nelse: pass',
+    '___ < ___',
+    '___ and ___',
+    'not ___'
+]};
+TOOLBOX_CATEGORY.CALCULATIONS = {name: "Calculation", colour: "MATH", blocks: [
+    "___ + ___",
+    "round(___)"
+]};
+TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING = {name: "Output", colour: "PLOTTING", blocks: [
+    "print(___)",
+    "plt.plot(___)",
+    "plt.scatter(___, ___)",
+    "plt.hist(___)",
+    "plt.show()",
+    "plt.title(___)",
+    "plt.xlabel(___)",
+    "plt.ylabel(___)"
+]};
+TOOLBOX_CATEGORY.TURTLES = {name: "Turtles", colour: "PLOTTING", blocks: [
+    "turtle.mainloop()",
+    "turtle.forward(50)",
+    "turtle.backward(50)",
+    "turtle.right(90)",
+    "turtle.left(90)",
+    "turtle.goto(0, 0)",
+    "turtle.setx(100)",
+    "turtle.sety(100)",
+    "turtle.setheading(270)",
+    "turtle.pendown()",
+    "turtle.penup()",
+    "turtle.pencolor('blue')"
+]};
+TOOLBOX_CATEGORY.INPUT = {name: "Input", colour: "TEXT", blocks: [
+    "input(___)",
+]};
+TOOLBOX_CATEGORY.VALUES = {name: "Values", colour: "TEXT", blocks: [
+    '""',
+    "0",
+    "True"
+]};
+TOOLBOX_CATEGORY.SEP = "<sep></sep>";
 
-// TODO: fix these to be more interesting
-BlockMirrorBlockEditor.prototype.TOOLBOXES['minimal'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
-BlockMirrorBlockEditor.prototype.TOOLBOXES['full'] = BlockMirrorBlockEditor.prototype.TOOLBOXES['normal'];
+TOOLBOX_CATEGORY.CONVERSIONS = {name: "Conversion", colour: "TEXT", blocks: [
+    "int(___)",
+    "float(___)",
+    "str(___)",
+    "bool(___)"
+]};
 
-/*
-xml += '<category name="Iteration" colour="300">' +
+TOOLBOX_CATEGORY.DICTIONARIES = {name: "Dictionaries", colour: "DICTIONARY", blocks: [
+    "{'1st key': ___, '2nd key': ___, '3rd key': ___}",
+    "{}",
+    "___['key']"
+]};
 
-    '<block type="ast_ForElse"></block>' +
-    '</category>';
-xml += '<category name="Values" colour="300">' +
-    '<block type="ast_Num"></block>' +
-    '</category>';
-//xml += '<category name="Values" colour="300"><button value="From Code">From Code</button></category>';
-xml += '</xml>';*/
\ No newline at end of file
+BlockMirrorBlockEditor.prototype.TOOLBOXES = {
+    //******************************************************
+    'minimal': [
+        // TODO: What should live in here?
+        TOOLBOX_CATEGORY.VARIABLES,
+    ],
+    //******************************************************
+    'normal': [
+        TOOLBOX_CATEGORY.VARIABLES,
+        TOOLBOX_CATEGORY.DECISIONS,
+        {name: "Iteration", colour: "CONTROL", blocks: [
+            'for ___ in ___: pass',
+            'while ___: pass',
+            'break',
+        ]},
+        {name: "Functions", colour: "FUNCTIONS", blocks: [
+            "def ___(___): pass",
+            "def ___(___: int)->str: pass",
+            "return ___",
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        TOOLBOX_CATEGORY.CALCULATIONS,
+        TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING,
+        TOOLBOX_CATEGORY.INPUT,
+        TOOLBOX_CATEGORY.TURTLES,
+        TOOLBOX_CATEGORY.SEP,
+        TOOLBOX_CATEGORY.VALUES,
+        TOOLBOX_CATEGORY.CONVERSIONS,
+        {name: "Lists", colour: "LIST", blocks: [
+            "[0, 0, 0]",
+            "[___, ___, ___]",
+            "[]",
+            "___.append(___)",
+            "range(0, 10)"
+        ]},
+        TOOLBOX_CATEGORY.DICTIONARIES
+    ],
+    //******************************************************
+    'ct': [
+        TOOLBOX_CATEGORY.VARIABLES,
+        TOOLBOX_CATEGORY.DECISIONS,
+        {name: "Iteration", colour: "CONTROL", blocks: [
+            'for ___ in ___: pass',
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        TOOLBOX_CATEGORY.CALCULATIONS,
+        TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING,
+        TOOLBOX_CATEGORY.INPUT,
+        TOOLBOX_CATEGORY.SEP,
+        TOOLBOX_CATEGORY.VALUES,
+        TOOLBOX_CATEGORY.CONVERSIONS,
+        {name: "Lists", colour: "LIST", blocks: [
+            "[0, 0, 0]",
+            "[___, ___, ___]",
+            "[]",
+            "___.append(___)"
+        ]}
+    ],
+    //******************************************************
+    'full': [
+        TOOLBOX_CATEGORY.VARIABLES,
+        {name: "Literal Values", colour: "LIST", blocks: [
+            "0",
+            "''",
+            "True",
+            "None",
+            "[___, ___, ___]",
+            "(___, ___, ___)",
+            "{___, ___, ___}",
+            "{___: ___, ___: ___, ___: ___}",
+            ]},
+        {name: "Calculations", colour: "MATH", blocks: [
+            "-___",
+            "___ + ___",
+            "___ >> ___",
+            "abs(___)",
+            "round(___)",
+        ]},
+        {name: "Logic", colour: "LOGIC", blocks: [
+            '___ if ___ else ___',
+            '___ == ___',
+            '___ < ___',
+            '___ in ___',
+            '___ and ___',
+            'not ___'
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        {name: "Classes", colour: "OO", blocks: [
+            "class ___: pass",
+            "class ___(___): pass",
+            "___.___",
+            "___: ___",
+            "super()"
+        ]},
+        {name: "Functions", colour: "FUNCTIONS", blocks: [
+            "def ___(___): pass",
+            "def ___(___: int)->str: pass",
+            "return ___",
+            "yield ___",
+            "lambda ___: ___"
+        ]},
+        {name: "Imports", colour: "PYTHON", blocks: [
+            "import ___",
+            "from ___ import ___",
+            "import ___ as ___",
+            "from ___ import ___ as ___"
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        {name: "Control Flow", colour: "CONTROL", blocks: [
+            'if ___: pass',
+            'if ___: pass\nelse: pass',
+            'for ___ in ___: pass',
+            'while ___: pass',
+            'break',
+            'continue',
+            'try: pass\nexcept ___ as ___: pass',
+            'raise ___',
+            'assert ___',
+            'with ___ as ___: pass'
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        TOOLBOX_CATEGORY.OUTPUT_WITH_PLOTTING,
+        TOOLBOX_CATEGORY.INPUT,
+        {name: "Files", colour: "FILE", blocks: [
+            "with open('', 'r') as ___: pass",
+            "___.read()",
+            "___.readlines()",
+            "___.write(___)",
+            "___.writelines(___)"
+        ]},
+        TOOLBOX_CATEGORY.SEP,
+        {name: "Conversion", colour: "TEXT", blocks: [
+            "int(___)",
+            "float(___)",
+            "str(___)",
+            "chr(___)",
+            "bool(___)",
+            "list(___)",
+            "dict(___)",
+            "tuple(___)",
+            "set(___)",
+            "type(___)",
+            "isinstance(___)"
+        ]},
+        {name: "Builtin Functions", colour: "SEQUENCES", blocks: [
+            "len(___)",
+            "sorted(___)",
+            "enumerate(___)",
+            "reversed(___)",
+            "range(0, 10)",
+            "min(___, ___)",
+            "max(___, ___)",
+            "sum(___)",
+            "all(___)",
+            "any(___)",
+            "zip(___, ___)",
+            "map(___, ___)",
+            "filter(___, ___)",
+        ]},
+        {name: "List Methods", colour: "LIST", blocks: [
+            "___.append(___)",
+            "___.pop()",
+            "___.clear()",
+        ]},
+        {name: "String Methods", colour: "TEXT", blocks: [
+            "___.startswith('')",
+            "___.endswith('')",
+            "___.replace('', '')",
+            "___.lower('')",
+            "___.upper('')",
+            "___.title('')",
+            "___.strip('')",
+            "___.split('')",
+            "''.join(___)",
+            "___.format('')",
+            "___.strip('')",
+        ]},
+        {name: "Subscripting", colour: "SEQUENCES", blocks: [
+            "___[___]",
+            "___[___:___]",
+            "___[___:___:___]"
+        ]},
+        {name: "Generators", colour: "SEQUENCES", blocks: [
+            "[___ for ___ in ___]",
+            "(___ for ___ in ___)",
+            "{___ for ___ in ___}",
+            "{___: ___ for ___ in ___ if ___}",
+            "[___ for ___ in ___ if ___]",
+            "(___ for ___ in ___ if ___)",
+            "{___ for ___ in ___ if ___}",
+            "{___: ___ for ___ in ___ if ___}"
+        ]},
+        {name: "Comments", colour: "PYTHON", blocks: [
+            "# ",
+            '"""\n"""'
+        ]}/*,
+        {name: "Weird Stuff", colour: "PYTHON", blocks: [
+            "delete ___",
+            "global ___"
+        ]}*/
+    ],
+};