diff --git a/src/editor/components/seExplorerButton.js b/src/editor/components/seExplorerButton.js
index 1bb8afd5..ac858346 100644
--- a/src/editor/components/seExplorerButton.js
+++ b/src/editor/components/seExplorerButton.js
@@ -50,8 +50,8 @@ template.innerHTML = `
   }
   .menu {
     position: absolute;
-    top:2px;
-    left:171px;
+    top:0px;
+    left:204px;
     background: none !important;
     display:none;
   }
@@ -63,7 +63,7 @@ template.innerHTML = `
     display: none;
     flex-wrap: wrap;
     flex-direction: row;
-    width: 136px;
+    width: 170px;
   }
   .menu-item {
     line-height: 1em;
@@ -247,8 +247,9 @@ export class ExplorerButton extends HTMLElement {
         break;
       case 'SE-BUTTON':
         // change to the current action
-        this.$img.setAttribute('src', ev.target.getAttribute('src'));
         this.currentAction = ev.target;
+        this.$img.setAttribute('src', this.currentAction.getAttribute('src'));
+        this.dataset.draw = this.data[this.currentAction.dataset.shape];
         this.currentAction.setAttribute('pressed', 'pressed');
         // and close the menu
         this.$menu.classList.remove('open');
@@ -280,17 +281,17 @@ export class ExplorerButton extends HTMLElement {
       // initialize buttons for all shapes defined for this library
       const response = await fetch(`${libDir}${lib}.json`);
       const json = await response.json();
-      const {data} = json;
+      this.data = json.data;
       const size = json.size ?? 300;
       const fill = json.fill ? '#333' : 'none';
       const off = size * 0.05;
       const vb = [-off, -off, size + off * 2, size + off * 2].join(' ');
       const stroke = json.fill ? 0 : (size / 30);
       // eslint-disable-next-line no-unsanitized/property
-      this.$lib.innerHTML = Object.entries(data).map(([key, path]) => {
+      this.$lib.innerHTML = Object.entries(this.data).map(([key, path]) => {
         const encoded = btoa(`
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
-          <svg viewBox="${vb}"><path fill="${fill}" stroke="#000" stroke-width="${stroke}" d="${path.toLowerCase()}"></path></svg>
+          <svg viewBox="${vb}"><path fill="${fill}" stroke="#000" stroke-width="${stroke}" d="${path}"></path></svg>
         </svg>`);
         return `<se-button data-shape="${key}"src="data:image/svg+xml;base64,${encoded}"></se-button>`;
       }).join('');
diff --git a/src/editor/extensions/ext-shapes/ext-shapes.js b/src/editor/extensions/ext-shapes/ext-shapes.js
index 16f02ab8..ae12d761 100644
--- a/src/editor/extensions/ext-shapes/ext-shapes.js
+++ b/src/editor/extensions/ext-shapes/ext-shapes.js
@@ -28,98 +28,13 @@ export default {
     const svgroot = canv.getRootElem();
     let lastBBox = {};
 
-    // This populates the category list
-    const {categories} = strings;
-    const library = {
-      basic: {
-        buttons: []
-      }
-    };
     const modeId = 'shapelib';
     const startClientPos = {};
 
-    let currentD, curShapeId, curShape, startX, startY;
-    let curLib = library.basic;
+    let curShape;
+    let startX;
+    let startY;
 
-    /**
-    *
-    * @returns {void}
-    */
-    function loadIcons () {
-      $('#shape_buttons').empty().append(curLib.buttons);
-    }
-
-    /**
-    * @typedef {PlainObject} module:Extension.Shapes.Shapes
-    * @property {PlainObject<string, string>} data
-    * @property {Integer} [size]
-    * @property {boolean} [fill]
-    */
-
-    /**
-    * @param {string|"basic"} cat Category ID
-    * @param {module:Extension.Shapes.Shapes} shapes
-    * @returns {void}
-    */
-    function makeButtons (cat, shapes) {
-      const size = curLib.size || 300;
-      const fill = curLib.fill || false;
-      const off = size * 0.05;
-      const vb = [-off, -off, size + off * 2, size + off * 2].join(' ');
-      const stroke = fill ? 0 : (size / 30);
-      const shapeIcon = new DOMParser().parseFromString(
-        '<svg xmlns="http://www.w3.org/2000/svg">' +
-          '<svg viewBox="' + vb + '">' +
-            '<path fill="' + (fill ? '#333' : 'none') +
-              '" stroke="#000" stroke-width="' + stroke + '" /></svg></svg>',
-        'text/xml'
-      );
-
-      const width = 24;
-      const height = 24;
-      shapeIcon.documentElement.setAttribute('width', width);
-      shapeIcon.documentElement.setAttribute('height', height);
-      const svgElem = $(document.importNode(shapeIcon.documentElement, true));
-
-      const {data} = shapes;
-
-      curLib.buttons = Object.entries(data).map(([id, pathD]) => {
-        const icon = svgElem.clone();
-        icon.find('path').attr('d', pathD);
-
-        const iconBtn = icon.wrap('<div class="tool_button">').parent().attr({
-          id: modeId + '_' + id,
-          title: id
-        });
-        // Store for later use
-        return iconBtn[0];
-      });
-    }
-
-    /**
-    * @param {string|"basic"} catId
-    * @returns {void}
-    */
-    function loadLibrary (catId) {
-      const lib = library[catId];
-
-      if (!lib) {
-        $('#shape_buttons').html(strings.loading);
-        $.getJSON('./shapelib/' + catId + '.json', function (result) {
-          curLib = library[catId] = {
-            data: result.data,
-            size: result.size,
-            fill: result.fill
-          };
-          makeButtons(catId, result);
-          loadIcons();
-        });
-        return;
-      }
-      curLib = lib;
-      if (!lib.buttons.length) { makeButtons(catId, lib); }
-      loadIcons();
-    }
     const buttons = [{
       id: 'tool_shapelib_show',
       type: 'mode_flyout',
@@ -136,101 +51,13 @@ export default {
         return Object.assign(buttons[i], button);
       }),
       callback () {
-        $('<style>').text(`
-          #shape_buttons {
-            overflow: auto;
-            width: 180px;
-            max-height: 300px;
-            display: table-cell;
-            vertical-align: middle;
-          }
-          #shape_cats {
-            min-width: 110px;
-            display: table-cell;
-            vertical-align: middle;
-            height: 300px;
-          }
-          #shape_cats > div {
-            line-height: 1em;
-            padding: .5em;
-            border:1px solid #B0B0B0;
-            background: #E8E8E8;
-            margin-bottom: -1px;
-          }
-          #shape_cats div:hover {
-            background: #FFFFCC;
-          }
-          #shape_cats div.current {
-            font-weight: bold;
-          }
-        `).appendTo('head');
-
-        const btnDiv = $('<div id="shape_buttons">');
-        $('#tools_shapelib > *').wrapAll(btnDiv);
-
-        const shower = $('#tools_shapelib_show');
-
-        loadLibrary('basic');
-
-        // Do mouseup on parent element rather than each button
-        $('#shape_buttons').mouseup(function (evt) {
-          const btn = $(evt.target).closest('div.tool_button');
-
-          if (!btn.length) { return; }
-
-          const copy = btn.children().clone();
-          shower
-            .append(copy)
-            .attr('data-curopt', '#' + btn[0].id) // This sets the current mode
-            .mouseup();
-          canv.setMode(modeId);
-
-          curShapeId = btn[0].id.substr((modeId + '_').length);
-          currentD = curLib.data[curShapeId];
-        });
-
-        const shapeCats = $('<div id="shape_cats">');
-
-        let catStr = '';
-        $.each(categories, function (id, label) {
-          catStr += '<div data-cat=' + id + '>' + label + '</div>';
-        });
-
-        shapeCats.html(catStr).children().bind('mouseup', function () {
-          const catlink = $(this);
-          catlink.siblings().removeClass('current');
-          catlink.addClass('current');
-
-          loadLibrary(catlink.attr('data-cat'));
-          // Get stuff
-          return false;
-        });
-
-        shapeCats.children().eq(0).addClass('current');
-
-        $('#tools_shapelib').append(shapeCats);
-
-        shower.mouseup(function () {
-          canv.setMode(currentD ? modeId : 'select');
-        });
-        $('#tool_shapelib').remove();
-
-        const h = $('#tools_shapelib').height();
-        $('#tools_shapelib').css({
-          'margin-top': -(h / 2 - 15),
-          'margin-left': 3
-        });
-        // Now add shape categories from locale
-        const cats = {};
-        Object.entries(categories).forEach(([o, categoryName]) => {
-          cats['#shape_cats [data-cat="' + o + '"]'] = categoryName;
-        });
-        this.setStrings('content', cats);
+        // should later register the event
       },
       mouseDown (opts) {
         const mode = canv.getMode();
         if (mode !== modeId) { return undefined; }
 
+        const currentD = document.getElementById('tool_shapelib_show').dataset.draw;
         startX = opts.start_x;
         const x = startX;
         startY = opts.start_y;
@@ -251,17 +78,19 @@ export default {
           }
         });
 
+        /*
         // Make sure shape uses absolute values
         if ((/[a-z]/).test(currentD)) {
           currentD = curLib.data[curShapeId] = canv.pathActions.convertPath(curShape);
           curShape.setAttribute('d', currentD);
           canv.pathActions.fixEnd(curShape);
         }
+        */
         curShape.setAttribute('transform', 'translate(' + x + ',' + y + ') scale(0.005) translate(' + -x + ',' + -y + ')');
 
         canv.recalculateDimensions(curShape);
 
-        /* const tlist = */ canv.getTransformList(curShape);
+        canv.getTransformList(curShape);
 
         lastBBox = curShape.getBBox();
 
@@ -282,8 +111,6 @@ export default {
         const tlist = canv.getTransformList(curShape),
           box = curShape.getBBox(),
           left = box.x, top = box.y;
-          // {width, height} = box,
-        // const dx = (x - startX), dy = (y - startY);
 
         const newbox = {
           x: Math.min(startX, x),
@@ -292,12 +119,6 @@ export default {
           height: Math.abs(y - startY)
         };
 
-        /*
-        // This is currently serving no purpose, so commenting out
-        let sy = height ? (height + dy) / height : 1,
-          sx = width ? (width + dx) / width : 1;
-        */
-
         let sx = (newbox.width / lastBBox.width) || 1;
         let sy = (newbox.height / lastBBox.height) || 1;