diff --git a/packages/mindplot/src/components/widget/FontFamilyPanel.js b/packages/mindplot/src/components/widget/FontFamilyPanel.js
index 7462c860..4ea79505 100644
--- a/packages/mindplot/src/components/widget/FontFamilyPanel.js
+++ b/packages/mindplot/src/components/widget/FontFamilyPanel.js
@@ -26,6 +26,7 @@ class FontFamilyPanel extends ListToolbarPanel {
       '<div id="times" model="Times" class="toolbarPanelLink" style="font-family:times;">Times</div>'
       + '<div id="arial"  model="Arial" style="font-family:arial;">Arial</div>'
       + '<div id="tahoma" model="Tahoma" style="font-family:tahoma;">Tahoma</div>'
+      + '<div id="tahoma" model="Luminari" style="font-family:Luminari">Luminari</div>'
       + '<div id="tahoma" model="Brush Script MT" style="font-family:\'Brush Script MT\';">Brush Script</div>'
       + '<div id="verdana" model="Verdana" style="font-family:verdana;">Verdana</div>',
     );
diff --git a/packages/web2d/src/components/Toolkit.js b/packages/web2d/src/components/Toolkit.js
index 11358570..db7bd42a 100644
--- a/packages/web2d/src/components/Toolkit.js
+++ b/packages/web2d/src/components/Toolkit.js
@@ -22,14 +22,16 @@ import LinePeer from './peer/svg/LinePeer';
 import PolyLinePeer from './peer/svg/PolyLinePeer';
 import CurvedLinePeer from './peer/svg/CurvedLinePeer';
 import ArrowPeer from './peer/svg/ArrowPeer';
+// eslint-disable-next-line import/no-cycle
 import TextPeer from './peer/svg/TextPeer';
 import ImagePeer from './peer/svg/ImagePeer';
 import RectPeer from './peer/svg/RectPeer';
-import ArialFont from './peer/svg/ArialFont';
-import TimesFont from './peer/svg/TimesFont';
-import VerdanaFont from './peer/svg/VerdanaFont';
-import TahomaFont from './peer/svg/TahomaFont';
-import BrushScriptMTFont from './peer/svg/BrushScriptFont';
+import ArialFont from './peer/svg/font/ArialFont';
+import TimesFont from './peer/svg/font/TimesFont';
+import VerdanaFont from './peer/svg/font/VerdanaFont';
+import TahomaFont from './peer/svg/font/TahomaFont';
+import LuminariFont from './peer/svg/font/LuminariFont';
+import BrushScriptMTFont from './peer/svg/font/BrushScriptFont';
 
 class Toolkit {
   static createFontByName(fontName) {
@@ -86,6 +88,10 @@ class Toolkit {
     return new TimesFont();
   }
 
+  static createLuminariFont() {
+    return new LuminariFont();
+  }
+
   static createVerdanaFont() {
     return new VerdanaFont();
   }
diff --git a/packages/web2d/src/components/Workspace.js b/packages/web2d/src/components/Workspace.js
index cc6110c4..821f5147 100644
--- a/packages/web2d/src/components/Workspace.js
+++ b/packages/web2d/src/components/Workspace.js
@@ -120,7 +120,7 @@ class Workspace extends ElementClass {
      * they are simple numbers, not CSS length quantities.
      */
   setCoordSize(width, height) {
-    this.peer.setCoordSize(width, height);
+    this.peer.setCoordSize(parseInt(width, 10), parseInt(height, 10));
   }
 
   /**
diff --git a/packages/web2d/src/components/peer/svg/ArialFont.js b/packages/web2d/src/components/peer/svg/font/ArialFont.js
similarity index 96%
rename from packages/web2d/src/components/peer/svg/ArialFont.js
rename to packages/web2d/src/components/peer/svg/font/ArialFont.js
index efe8bcba..a627695f 100644
--- a/packages/web2d/src/components/peer/svg/ArialFont.js
+++ b/packages/web2d/src/components/peer/svg/font/ArialFont.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import FontPeer from './FontPeer';
+import FontPeer from '../FontPeer';
 
 class ArialFont extends FontPeer {
   constructor() {
diff --git a/packages/web2d/src/components/peer/svg/BrushScriptFont.js b/packages/web2d/src/components/peer/svg/font/BrushScriptFont.js
similarity index 96%
rename from packages/web2d/src/components/peer/svg/BrushScriptFont.js
rename to packages/web2d/src/components/peer/svg/font/BrushScriptFont.js
index 3aa94cdc..eff0f95d 100644
--- a/packages/web2d/src/components/peer/svg/BrushScriptFont.js
+++ b/packages/web2d/src/components/peer/svg/font/BrushScriptFont.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import FontPeer from './FontPeer';
+import FontPeer from '../FontPeer';
 
 class BrushScriptMTFont extends FontPeer {
   // eslint-disable-next-line class-methods-use-this
diff --git a/packages/web2d/src/components/peer/svg/font/LuminariFont.js b/packages/web2d/src/components/peer/svg/font/LuminariFont.js
new file mode 100644
index 00000000..cdc206e7
--- /dev/null
+++ b/packages/web2d/src/components/peer/svg/font/LuminariFont.js
@@ -0,0 +1,26 @@
+/*
+ *    Copyright [2021] [wisemapping]
+ *
+ *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ *   It is basically the Apache License, Version 2.0 (the "License") plus the
+ *   "powered by wisemapping" text requirement on every single page;
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the license at
+ *
+ *       http://www.wisemapping.org/license
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */
+import FontPeer from '../FontPeer';
+
+class LuminariFont extends FontPeer {
+  constructor() {
+    super('Luminari');
+  }
+}
+
+export default LuminariFont;
diff --git a/packages/web2d/src/components/peer/svg/TahomaFont.js b/packages/web2d/src/components/peer/svg/font/TahomaFont.js
similarity index 96%
rename from packages/web2d/src/components/peer/svg/TahomaFont.js
rename to packages/web2d/src/components/peer/svg/font/TahomaFont.js
index 69bb8830..cf64acb3 100644
--- a/packages/web2d/src/components/peer/svg/TahomaFont.js
+++ b/packages/web2d/src/components/peer/svg/font/TahomaFont.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import FontPeer from './FontPeer';
+import FontPeer from '../FontPeer';
 
 class TahomaFont extends FontPeer {
   constructor() {
diff --git a/packages/web2d/src/components/peer/svg/TimesFont.js b/packages/web2d/src/components/peer/svg/font/TimesFont.js
similarity index 96%
rename from packages/web2d/src/components/peer/svg/TimesFont.js
rename to packages/web2d/src/components/peer/svg/font/TimesFont.js
index 583b5c00..25a366d8 100644
--- a/packages/web2d/src/components/peer/svg/TimesFont.js
+++ b/packages/web2d/src/components/peer/svg/font/TimesFont.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import FontPeer from './FontPeer';
+import FontPeer from '../FontPeer';
 
 class TimesFont extends FontPeer {
   constructor() {
diff --git a/packages/web2d/src/components/peer/svg/VerdanaFont.js b/packages/web2d/src/components/peer/svg/font/VerdanaFont.js
similarity index 96%
rename from packages/web2d/src/components/peer/svg/VerdanaFont.js
rename to packages/web2d/src/components/peer/svg/font/VerdanaFont.js
index e527baeb..5a152ee6 100644
--- a/packages/web2d/src/components/peer/svg/VerdanaFont.js
+++ b/packages/web2d/src/components/peer/svg/font/VerdanaFont.js
@@ -15,7 +15,7 @@
  *   See the License for the specific language governing permissions and
  *   limitations under the License.
  */
-import FontPeer from './FontPeer';
+import FontPeer from '../FontPeer';
 
 class VerdanaFont extends FontPeer {
   constructor() {