diff --git a/src/css/draginput.css b/src/css/draginput.css
index 698c439..48c5b21 100644
--- a/src/css/draginput.css
+++ b/src/css/draginput.css
@@ -16,6 +16,14 @@
   overflow: hidden;
 }
 
+.draginput.button {
+  text-align: center;
+  color: #999;
+  padding-top: 10px;
+  box-sizing: border-box;
+  cursor: pointer;
+}
+
  .draginput .caret {
   border: solid transparent 5px;
   border-top-color: var(--z9);
diff --git a/src/css/fve.css b/src/css/fve.css
new file mode 100644
index 0000000..346aa88
--- /dev/null
+++ b/src/css/fve.css
@@ -0,0 +1,8 @@
+/*
+#tool_save,
+#tool_source,
+#tool_export,
+#tool_wireframe + .separator {
+  display: none;
+}
+*/
\ No newline at end of file
diff --git a/src/font-files/FVE_Harlow.ttf b/src/font-files/FVE_Harlow.ttf
new file mode 100644
index 0000000..574ad5d
Binary files /dev/null and b/src/font-files/FVE_Harlow.ttf differ
diff --git a/src/images/favicon.svg b/src/images/favicon.svg
index 3e389f4..cf02b00 100644
--- a/src/images/favicon.svg
+++ b/src/images/favicon.svg
@@ -1,4 +1,4 @@
-<svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-  <path d="M-.1 16.1L16 .04V16.1H-.1z" fill="#ccc"></path>
-  <path d="M0 16.1V.1l16 16H0z" fill="#666"></path>
+<svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path d="M16 0H11L8 6V0H4V15H8V9.5L11 15H16L11.517 7.49007L16 0Z" fill="#1EB5E8"></path>
+  <path d="M0 0H4H8V3H4V6H8V9H4V15H0V9V6V3V0Z" fill="white"></path>
 </svg>
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index a9e3a92..b6d4a7c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,9 +6,9 @@
   <link rel="icon" href="images/favicon.svg" sizes="any" type="image/svg+xml">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
   <meta name="apple-mobile-web-app-capable" content="yes"/>
-  <title>Method Draw Vector Editor</title>
+  <title>Fujikohsan Vector Editor</title>
   <meta charset="utf-8">
-  <meta name="description" content="Method Draw is an open source SVG editor for the web, you can use it online without signing up.">
+  <meta name="description" content="Fujikohsan Vector Editor">
 
   <!-- build:css all.css -->
   <link rel="stylesheet" href="css/base.css" type="text/css"/>
@@ -28,6 +28,7 @@
   <link rel="stylesheet" href="css/keyboard.css" type="text/css"/>
   <link rel="stylesheet" href="css/dialog.css" type="text/css"/>
   <link rel="stylesheet" href="css/method-draw.css" type="text/css"/>
+  <link rel="stylesheet" href="css/fve.css" type="text/css"/>
   <link rel="stylesheet" href="css/app.css" type="text/css"/>
   <link rel="stylesheet" href="css/tools.css" type="text/css"/>
   <link rel="stylesheet" href="css/button.css" type="text/css"/>
@@ -55,9 +56,9 @@
 <div id="menu_bar">
   <a class="menu">
     <div class="menu_title" id="logo">
-      <svg viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
-        <path d="M-.1 16.1L16 .04V16.1H-.1z" fill="var(--z12)"></path>
-        <path d="M0 16.1V.1l16 16H0z" fill="var(--z6)"></path>
+      <svg width="16" height="15" viewBox="0 0 16 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M16 0H11L8 6V0H4V15H8V9.5L11 15H16L11.517 7.49007L16 0Z" fill="#1EB5E8"></path>
+        <path d="M0 0H4H8V3H4V6H8V9H4V15H0V9V6V3V0Z" fill="white"></path>
       </svg>
     </div>
     <div class="menu_list">
@@ -122,7 +123,7 @@
         <div class="menu_item push_button_pressed" id="tool_rulers">View Rulers <span class="shortcut">⇧R</span></div>
         <div class="menu_item" id="tool_wireframe">View Wireframe</div>
         <div class="separator"></div>
-        <div class="menu_item" id="tool_source" data-action="source">Source... <span class="shortcut">⌘U</span></div>
+        <div class="menu_item" id="tool_source" data-action="source">View Source... <span class="shortcut">⌘U</span></div>
     </div>
   </div>
 </div>
@@ -362,7 +363,7 @@
       <div class="toolset draginput twocol" id="tool_font_family">
           <!-- Font family -->
         <span>Font</span>
-        <div id="preview_font" style="font-family: sans-serif">sans-serif</div>
+        <div id="preview_font"></div>
         <div class="caret"></div>
         <input id="font_family" data-title="Change Font Family" size="12" type="hidden" />
         <select id="font_family_dropdown">
@@ -549,9 +550,12 @@
             </svg>
           </div>
         </div>
-    </div>
+    </div>    
+
     <div class="clearfix"></div>
 
+    <div class="tool_button" id="tool_text_on_path" title="Place text on path">Place text on path</div>
+
   </div>
   
   <div id="stroke_panel" class="context_panel">
@@ -735,6 +739,7 @@
   <script type="text/javascript" src="js/lib/jquery.jgraduate.js"></script>
   <script type="text/javascript" src="js/lib/jquery.contextMenu.js"></script>
   <script type="text/javascript" src="js/lib/jquery-ui-1.8.17.custom.min.js"></script>
+  <script type="text/javascript" src="js/lib/css.min.js"></script>
   <script type="text/javascript" src="js/jquery.attr.js"></script>
   <script type="text/javascript" src="js/lib/jquery-draginput.js"></script>
   <script type="text/javascript" src="js/utils.js"></script>
@@ -765,6 +770,7 @@
   <script type="text/javascript" src="js/Import.js"></script>
   <script type="text/javascript" src="js/PaintBox.js"></script>
   <script type="text/javascript" src="js/Palette.js"></script>
+  <script type="text/javascript" src="js/Textonpath.js"></script>
   <script type="text/javascript" src="js/Zoom.js"></script>
   <script type="text/javascript" src="js/Modal.js"></script>
   <script type="text/javascript" src="js/ContextMenu.js"></script>
@@ -775,7 +781,6 @@
   <script type="text/javascript" src="js/lib/jpicker.min.js"></script>
   <script type="text/javascript" src="js/lib/mousewheel.js"></script>
   <script type="text/javascript" src="js/eyedropper.js"></script>
-  <!--<script type="text/javascript" src="js/grid.js"></script>-->
   <script type="text/javascript" src="js/lib/requestanimationframe.js"></script>
   <script type="text/javascript" src="js/lib/taphold.js"></script>
   <script type="text/javascript" src="js/lib/filesaver.js"></script>
diff --git a/src/js/Panel.js b/src/js/Panel.js
index 5fc4fb8..827b642 100644
--- a/src/js/Panel.js
+++ b/src/js/Panel.js
@@ -33,12 +33,12 @@ MD.Panel = function(){
     $('#text_x')       .dragInput({ min: null, max: null,  step:  1,  callback: editor.changeAttribute,     cursor: false  });
     $('#image_y')      .dragInput({ min: null, max: null,  step:  1,  callback: editor.changeAttribute,     cursor: false  });
     $('#rect_rx')      .dragInput({ min: 0,    max: 100,   step:  1,  callback: editor.changeAttribute,     cursor: true   });
-    $('#stroke_width') .dragInput({ min: 0,    max: 99,    step:  1,  callback: editor.changeAttribute,   cursor: true, smallStep: 0.1, start: 1.5          });
+    $('#stroke_width') .dragInput({ min: 0,    max: 99,    step:  1,  callback: editor.changeAttribute,     cursor: true, smallStep: 0.1, start: 1.5          });
     $('#angle')        .dragInput({ min: -180, max: 180,   step:  1,  callback: editor.changeRotationAngle, cursor: false, dragAdjust: 0.5      });
-    $('#font_size')    .dragInput({ min: 1,    max: 250,   step: 1,   callback: editor.text.changeFontSize,      cursor: true, stepfunc: editor.stepFontSize, dragAdjust: .15 });
+    $('#font_size')    .dragInput({ min: 1,    max: 250,   step: 1,   callback: editor.text.changeFontSize, cursor: true, stepfunc: editor.stepFontSize, dragAdjust: .15 });
     $('#group_opacity').dragInput({ min: 0,    max: 100,   step:  5,  callback: editor.changeAttribute,     cursor: true,  start: 100             });
     $('#blur')         .dragInput({ min: 0,    max: 10,    step: .1,  callback: editor.changeBlur,          cursor: true,  start: 0               });
-
+    $('#textPath_offset').dragInput({ min: 0,  max: null,   step: 1,  callback: editor.text.setTextPathAttr,cursor: true,  start: 0               });
 
     // Align
 
@@ -82,7 +82,6 @@ MD.Panel = function(){
       svgCanvas.pathActions.opencloseSubPath();
     });
 
-
     function show(elem) {
       $('.context_panel').hide();
       if (elem === "canvas") return $('#canvas_panel').show();
@@ -100,8 +99,42 @@ MD.Panel = function(){
       $.fn.dragInput.updateCursor($('#blur')[0])
     }
 
+    function pathEditContext(){
+       $('.context_panel').hide();
+       $('#path_node_panel').show();
+       $('#stroke_panel').hide();
+       var point = svgCanvas.pathActions.getNodePoint();
+       $('#tool_add_subpath').removeClass('push_button_pressed').addClass('tool_button');
+       $('#tool_node_delete').toggleClass('disabled', !svgCanvas.pathActions.canDeleteNodes);
+       if(point) {
+         var seg_type = $('#seg_type');
+         point.x = svgedit.units.convertUnit(point.x);
+         point.y = svgedit.units.convertUnit(point.y);
+         $('#path_node_x').val(Math.round(point.x));
+         $('#path_node_y').val(Math.round(point.y));
+         if(point.type) {
+           seg_type.val(point.type).removeAttr('disabled');
+           $("#seg_type_label").html(point.type === 4 ? "Straight" : "Curve")
+         } else {
+           seg_type.val(4).attr('disabled','disabled');
+         }
+       }
+       $("#panels").removeClass("multiselected")        
+       $("#stroke_panel").hide();
+       $("#canvas_panel").hide();
+       return;
+     }
+
+    function canPutTextOnPath(elems) {
+      if (elems.length !== 2) return false;
+      const text = elems.find(elem => elem.tagName === "text");
+      const path = elems.find(elem => ["ellipse", "circle", "line", "polyline", "polygon", "rect", "path"].indexOf(elem.tagName) > -1);
+      return (!!text && !!path);
+    }
+
+
     function updateContextPanel(elems) {
-     if (!elems) elems = editor.selected;
+      if (!elems) elems = editor.selected;
      var elem = elems[0] || editor.selected[0];
      const isNode = svgCanvas.pathActions.getNodePoint()
      // If element has just been deleted, consider it null
@@ -122,7 +155,9 @@ MD.Panel = function(){
      if (multiselected) {
        const multi = elems.filter(Boolean);
        elem = (svgCanvas.elementsAreSame(multi)) ? multi[0] : null
-       if (elem) $("#panels").addClass("multiselected")
+       if (elem) $("#panels").addClass("multiselected");
+       const canTextPath = canPutTextOnPath(multi);
+       $("#tool_text_on_path").toggle(canTextPath);
      }
 
      if (!elem && !multiselected) {
@@ -132,6 +167,7 @@ MD.Panel = function(){
      }
  
      if (elem !== null) {
+       
        $("#stroke_panel").show();
        var elname = elem.nodeName;
        var angle = svgCanvas.getRotationAngle(elem);
@@ -151,8 +187,10 @@ MD.Panel = function(){
              y = bb.y;
            }
          }
+         
          x = svgedit.units.convertUnit(x);
          y = svgedit.units.convertUnit(y);
+
          $("#" + elname +"_x").val(Math.round(x))
          $("#" + elname +"_y").val(Math.round(y))
          if (elname === "polyline") {
@@ -222,10 +260,18 @@ MD.Panel = function(){
          if(el_name === "rect") $("#cornerRadiusLabel").show()
          else $("#cornerRadiusLabel").hide()
          
-         $.each(cur_panel, function(i, item) {
-           var attrVal = elem.getAttribute(item);
+         cur_panel.forEach((item, i) => {
+            var attrVal = elem.getAttribute(item);
            //update the draginput cursors
            var name_item = document.getElementById(el_name + '_' + item);
+           // find a textPath to put correct x and y
+           if (el_name === "text") {
+             const textPath = elem.querySelector("textPath");
+             if (textPath) {
+              var bb = elem.getBBox();
+              if (bb) attrVal = bb[item];
+             }
+           }
            name_item.value = Math.round(attrVal) || 0;
            if (name_item.getAttribute("data-cursor") === "true") {
              $.fn.dragInput.updateCursor(name_item );
@@ -233,7 +279,7 @@ MD.Panel = function(){
          });
          
          if(el_name === 'text') {
-           var font_family = elem.getAttribute("font-family") || "serif";
+           var font_family = elem.getAttribute("font-family") || "default";
            var cleanFontFamily = font_family.split(",")[0].replace(/'/g, "");
            var select = document.getElementById("font_family_dropdown");
            $('#text_panel').css("display", "inline");  
@@ -246,6 +292,9 @@ MD.Panel = function(){
            $('#font_size').val(elem.getAttribute("font-size"));
            $('#text').val(elem.textContent);
            $('#preview_font').text(cleanFontFamily).css('font-family', font_family);
+           const textPath = elem.querySelector("textPath");
+           document.getElementById("text_panel").classList.toggle("text-path", textPath);
+           $("#textPath_offset").val(textPath ? textPath.getAttribute("startOffset") : 0);
          } // text
          else if(el_name === 'image') {
             const url = svgCanvas.getHref(elem)
@@ -289,7 +338,7 @@ MD.Panel = function(){
      
      if ( (elem && !isNode) || multiselected) {
        // update the selected elements' layer
-       $('#selLayerNames').removeAttr('disabled').val(currentLayerName);
+       $('#selLayerNames').removeAttr('disabled').val(svgCanvas.getCurrentDrawing().getCurrentLayerName());
        
        // Enable regular menu options
        $("#cmenu_canvas").enableContextMenuItems('#delete,#cut,#copy,#move_front,#move_up,#move_down,#move_back');
diff --git a/src/js/Text.js b/src/js/Text.js
index 3cdc94f..b69fea8 100644
--- a/src/js/Text.js
+++ b/src/js/Text.js
@@ -1,5 +1,27 @@
 MD.Text = function(){
 
+  function placeTextOnPath(){
+    const elems = editor.selected;
+    const needsConversion = elems.find(elem => ["ellipse", "circle", "line", "polyline", "polygon", "rect"].indexOf(elem.tagName) > -1);
+    if (needsConversion) {
+      const path = svgCanvas.convertToPath(needsConversion);
+      const text = elems.find(elem => elem.tagName === "text");
+      svgCanvas.addToSelection([path, text]);
+    }
+
+    const text = svgCanvas.textPath();
+    svgCanvas.clearSelection();
+    svgCanvas.addToSelection([text]);
+    editor.selectedChanged(window, [text]);
+  }
+
+  function releaseTextOnPath(){
+    const text = svgCanvas.releaseTextPath();
+    const selector = svgCanvas.selectorManager.requestSelector(text);
+    selector.resize();
+    editor.selectedChanged(window, [text]);
+  }
+
   function setBold(){
     if ($(this).hasClass("disabled")) return;
     svgCanvas.setBold( !svgCanvas.getBold() );
@@ -16,6 +38,9 @@ MD.Text = function(){
     svgCanvas.setFontFamily(this.value);
   });
 
+  $('#tool_text_on_path').click(placeTextOnPath);
+  $('#tool_release_text_on_path').click(releaseTextOnPath);
+
   $("#tool_bold").on("click", setBold);
   $("#tool_italic").on("click", setItalic);
 
@@ -43,8 +68,8 @@ MD.Text = function(){
     document.fonts.onloadingdone = function (fontFaceSetEvent) {
     const els = svgCanvas.getSelectedElems();
       els.forEach(el => {
-          var selector = svgCanvas.selectorManager.requestSelector(el);
-          selector.resize();
+        var selector = svgCanvas.selectorManager.requestSelector(el);
+        selector.resize();
       })
      };
     
@@ -67,8 +92,15 @@ MD.Text = function(){
     svgCanvas.setFontSize($("#font_size").val());
   }
 
+  function setTextPathAttr(a, val){
+    svgCanvas.setTextPathAttr('startOffset', val);
+    var elems = svgCanvas.getSelectedElems();
+    svgCanvas.selectorManager.requestSelector(elems[0]).reset(elems[0]);
+  }
+
   this.setBold = setBold;
   this.setItalic = setItalic;
   this.changeFontSize = changeFontSize;
+  this.setTextPathAttr = setTextPathAttr;
 
 }
\ No newline at end of file
diff --git a/src/js/Textonpath.js b/src/js/Textonpath.js
new file mode 100644
index 0000000..68a246b
--- /dev/null
+++ b/src/js/Textonpath.js
@@ -0,0 +1,3 @@
+MD.TextOnPath = function(){
+  console.log("hi")
+}
\ No newline at end of file
diff --git a/src/js/exportHandler.js b/src/js/exportHandler.js
new file mode 100644
index 0000000..5f5b968
--- /dev/null
+++ b/src/js/exportHandler.js
@@ -0,0 +1,32 @@
+function exportHandler(window, data) {
+  var issues = data.issues;
+  
+  if(!$('#export_canvas').length) {
+    $('<canvas>', {id: 'export_canvas'}).hide().appendTo('body');
+  }
+  var c = $('#export_canvas')[0];
+  
+  c.width = svgCanvas.contentW;
+  c.height = svgCanvas.contentH;
+  canvg(c, data.svg, {renderCallback: function() {
+    var datauri = c.toDataURL('image/png');  
+    if (!datauri) return false;
+    var filename = "Method Draw Image";
+    var type = 'image/png';
+    var file = svgedit.utilities.dataURItoBlob(datauri, type);
+    if (window.navigator.msSaveOrOpenBlob) // IE10+
+        window.navigator.msSaveOrOpenBlob(file, filename);
+    else { // Others
+        var a = document.createElement("a"),
+                url = URL.createObjectURL(file);
+        a.href = url;
+        a.download = filename;
+        document.body.appendChild(a);
+        a.click();
+        setTimeout(function() {
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(url);
+        }, 0);
+    }
+  }});
+}
\ No newline at end of file
diff --git a/src/js/fonts.js b/src/js/fonts.js
index 62511d9..dd9d404 100644
--- a/src/js/fonts.js
+++ b/src/js/fonts.js
@@ -1,9 +1,5 @@
 function populateFonts(fonts){
-  let options = `
-    <option value='sans-serif' selected>sans-serif</option>
-    <option value='serif' selected>serif</option>
-    <option value='monospace' selected>monospace</option>
-  `;
+  let options = "";
   let fontfaces = "";
   const formats = {
     ttf: "truetype",
@@ -12,589 +8,1012 @@ function populateFonts(fonts){
     woff: "woff",
     woff2: "woff2",
   };
-  for (fontName in fonts) {
-    const variants = fonts[fontName];
-    for (variantName in variants) {
-      const variant = variants[variantName];
-      const ext = variant.file.split(".")[1].toLowerCase();
-      const format = formats[ext];
-      const src = `url('font-files/${variant.file}') format('${format}')`;
-      fontfaces += `
-        @font-face {
-          font-family: '${fontName}';
-          src: ${src};
-          font-weight: ${variant["font-weight"]};
-          font-style: ${variant["font-style"]};
-        }
-      `;
-    }
-    options += `
-      <option value="${fontName}">${fontName}</option>
-    `;
-  }
+  var frag = document.createDocumentFragment();
+  for (charset in fonts) {
+    const optgroup = document.createElement("optgroup");
+    optgroup.setAttribute("label", charset);
+    frag.appendChild(optgroup);
 
-  $("#font_family_dropdown").append(options);
+    const cFonts = fonts[charset]
+
+    for (fontName in cFonts) {
+      const variants = cFonts[fontName];
+      for (variantName in variants) {
+        const variant = variants[variantName];
+        const ext = variant.file.split(".")[1].toLowerCase();
+        const format = formats[ext];
+        const src = `url('font-files/${variant.file}') format('${format}')`;
+        fontfaces += `
+          @font-face {
+            font-family: '${fontName}';
+            src: ${src};
+            font-weight: ${variant["font-weight"]};
+            font-style: ${variant["font-style"]};
+          }
+        `;
+      }
+
+      var option = document.createElement("option");
+      if (fontName === "Noto Sans JP") option.selected = true;
+      option.value = fontName;
+      option.text = variants[Object.keys(variants)[0]].name || fontName;
+      optgroup.appendChild(option);
+    }
+  }
+  
+  $("#font_family_dropdown").append(frag);
   $("head").append("<style>" + fontfaces +"</style>");
 
 };
 
-const fonts = {
+const charsetFonts = {
 
-  "Anton": {
-    "Regular": {
-      "file": "Anton-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+  "Japanese Character Set" : {
+
+    "Noto Serif JP": {
+      "Regular": {
+        "file": "NotoSerifJP-Regular.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Bold": {
+        "file": "NotoSerifJP-Bold.otf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+    },
+    "Noto Serif JP ExtraLight": {
+      "Regular": {
+        "file": "NotoSerifJP-ExtraLight.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Serif JP Light": {
+      "Regular": {
+        "file": "NotoSerifJP-ExtraLight.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Serif JP Medium": {
+      "Regular": {
+        "file": "NotoSerifJP-Medium.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Serif JP SemiBold": {
+      "Regular": {
+        "file": "NotoSerifJP-SemiBold.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Serif JP Black": {
+      "Regular": {
+        "file": "NotoSerifJP-Black.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Noto Sans JP": {
+      "Regular": {
+        "file": "NotoSansJP-Regular.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Bold": {
+        "file": "NotoSansJP-Bold.otf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+    },
+    "Noto Sans JP Thin": {
+      "Regular": {
+        "file": "NotoSansJP-Thin.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Sans JP Light": {
+      "Regular": {
+        "file": "NotoSansJP-Light.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Sans JP Medium": {
+      "Regular": {
+        "file": "NotoSansJP-Medium.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Noto Sans JP Black": {
+      "Regular": {
+        "file": "NotoSansJP-Black.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Rounded Mplus 1c": {
+      "Regular": {
+        "file": "MPLUSRounded1c-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    "Rounded Mplus 1c Thin": {
+      "Regular": {
+        "file": "MPLUSRounded1c-Thin.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    "Rounded Mplus 1c Light": {
+      "Regular": {
+        "file": "MPLUSRounded1c-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    "Rounded Mplus 1c Medium": {
+      "Regular": {
+        "file": "MPLUSRounded1c-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    //"Rounded Mplus 1c Bold": {
+    //  "Regular": {
+    //    "file": "MPLUSRounded1c-Bold.ttf",
+    //    "font-weight": "normal",
+    //    "font-style": "normal"
+    //  }
+    //},
+    "Rounded Mplus 1c ExtraBold": {
+      "Regular": {
+        "file": "MPLUSRounded1c-ExtraBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    "Rounded Mplus 1c Black": {
+      "Regular": {
+        "file": "MPLUSRounded1c-Black.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+
+    "Gen Jyuu Gothic Regular": {
+      "Regular": {
+        "name": "源柔ゴシック Regular",
+        "file": "GenJyuuGothic-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
+    "Gen Jyuu Gothic ExtraLight": {
+      "Regular": {
+        "name": "源柔ゴシック ExtraLight",
+        "file": "GenJyuuGothic-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Light": {
+      "Regular": {
+        "name": "源柔ゴシック Light",
+        "file": "GenJyuuGothic-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Normal": {
+      "Regular": {
+        "name": "源柔ゴシック Normal",
+        "file": "GenJyuuGothic-Normal.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Medium": {
+      "Regular": {
+        "name": "源柔ゴシック Medium",
+        "file": "GenJyuuGothic-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Bold": {
+      "Bold": {
+        "name": "源柔ゴシック Bold",
+        "file": "GenJyuuGothic-Bold.ttf",
+        "font-weight": "normal",
+        "font-style": "bold"
+      },
+    },
+    "Gen Jyuu Gothic Heavy": {
+      "Bold": {
+        "name": "源柔ゴシック Heavy",
+        "file": "GenJyuuGothic-Heavy.ttf",
+        "font-weight": "normal",
+        "font-style": "bold"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Regular": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Regular",
+        "file": "GenJyuuGothic-Monospace-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace ExtraLight": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 ExtraLight",
+        "file": "GenJyuuGothic-Monospace-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Light": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Light",
+        "file": "GenJyuuGothic-Monospace-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Normal": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Normal",
+        "file": "GenJyuuGothic-Monospace-Normal.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Medium": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Medium",
+        "file": "GenJyuuGothic-Monospace-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Bold": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Bold",
+        "file": "GenJyuuGothic-Monospace-Bold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic Monospace Heavy": {
+      "Regular": {
+        "name": "源柔ゴシック等幅 Heavy",
+        "file": "GenJyuuGothic-Monospace-Heavy.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P Regular": {
+      "Regular": {
+        "name": "源柔ゴシックP Regular",
+        "file": "GenJyuuGothic-P-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P ExtraLight": {
+      "Regular": {
+        "name": "源柔ゴシックP ExtraLight",
+        "file": "GenJyuuGothic-P-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P Light": {
+      "Regular": {
+        "name": "源柔ゴシックP Light",
+        "file": "GenJyuuGothic-P-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P Normal": {
+      "Regular": {
+        "name": "源柔ゴシックP Normal",
+        "file": "GenJyuuGothic-P-Normal.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P Medium": {
+      "Regular": {
+        "name": "源柔ゴシックP Medium",
+        "file": "GenJyuuGothic-P-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "Gen Jyuu Gothic P Bold": {
+      "Bold": {
+        "name": "源柔ゴシックP Bold",
+        "file": "GenJyuuGothic-P-Bold.ttf",
+        "font-weight": "normal",
+        "font-style": "bold"
+      },
+    },
+    "Gen Jyuu Gothic P Heavy": {
+      "Bold": {
+        "name": "源柔ゴシックP Heavy",
+        "file": "GenJyuuGothic-P-Heavy.ttf",
+        "font-weight": "normal",
+        "font-style": "bold"
+      },
+    },
+
+    "SetoFont": {
+      "Regular": {
+        "name": "瀬戸フォント",
+        "file": "setofont.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "SetoFont-ex": {
+      "Regular": {
+        "name": "瀬戸フォント-拡張",
+        "file": "setofont-ex.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "HanaMinA": {
+      "Regular": {
+        "name": "花園明朝A",
+        "file": "HanaMinA.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+    "HanaMinB": {
+      "Regular": {
+        "name": "花園明朝B",
+        "file": "HanaMinB.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "KouzanBrushFontGyousyoOTF": {
+      "Regular": {
+        "name": "衡山毛筆フォント行書",
+        "file": "KouzanGyoushoOTF.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "KouzanBrushFontOTF": {
+      "Regular": {
+        "name": "衡山毛筆フォント",
+        "file": "KouzanMouhituFontOTF.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "KouzanBrushFontSousyoOTF": {
+      "Regular": {
+        "name": "衡山毛筆フォント草書",
+        "file": "KouzanSoushoOTF.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "aoyagireisyosimo2": {
+      "Regular": {
+        "name": "青柳隷書SIMO2",
+        "file": "aoyagireisyosimo_ttf_2_02.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
     }
+
   },
 
-  "Asset": {
-    "Regular": {
-      "file": "Asset-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+"Latin Character Set": {
 
-  "Calistoga": {
-    "Regular": {
-      "file": "Calistoga-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Anton": {
+      "Regular": {
+        "file": "Anton-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
 
-  "Emilys Candy": {
-    "Regular": {
-      "file": "EmilysCandy-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Asset": {
+      "Regular": {
+        "file": "Asset-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
 
-  "Great Vibes": {
-    "Regular": {
-      "file": "GreatVibes-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Bankoli": {
+      "Bold": {
+        "file": "BAIR.TTF",
+        "font-weight": "bold",
+        "font-style": "normal"
+      }
+    },
 
-  "Harlow Solid Italic": {
-    "Italic": {
-      "file": "HARLOWSI_0.TTF",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
+    "Bauhaus 93": {
+      "Normal": {
+        "file": "BAUHS93_0.TTF",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
 
-  "Rounded Mplus 1c": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Beastmachine": {
+      "Regular": {
+        "file": "Beastmachine.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
 
-  "Rounded Mplus 1c Thin": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Thin.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
-  
-  "Rounded Mplus 1c Light": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
-  "Rounded Mplus 1c Medium": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Medium.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
-  "Rounded Mplus 1c Bold": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Bold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
-  "Rounded Mplus 1c ExtraBold": {
-    "Regular": {
-      "file": "MPLUSRounded1c-ExtraBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
-  "Rounded Mplus 1c Black": {
-    "Regular": {
-      "file": "MPLUSRounded1c-Black.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Calistoga": {
+      "Regular": {
+        "file": "Calistoga-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
+    },
 
-  "Montserrat": {
-    "Regular": {
-      "file": "Montserrat-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Cooper Std Black": {
+      "Regular": {
+        "file": "CooperBlackStd.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "CooperBlackStd-Italic.otf",
+        "font-style": "italic",
+        "font-weight": "normal"
+      },
     },
-    "Italic": {
-      "file": "Montserrat-Italic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    },
-    "Bold": {
-      "file": "Montserrat-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    },
-    "Bold Italic": {
-      "file": "Montserrat-BoldItalic.ttf",
-      "font-weight": "bold",
-      "font-style": "italic",
-    }
-  },
-  "Montserrat Thin": {
-    "Regular": {
-      "file": "Montserrat-Thin.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-ThinItalic.ttf",
-      "font-style": "italic",
-      "font-weight": "normal"
-    }
-  },
-  "Montserrat ExtraLight": {
-    "Regular": {
-      "file": "Montserrat-ExtraLight.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-ExtraLightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
-  "Montserrat Light": {
-    "Regular": {
-      "file": "Montserrat-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-LightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
-  "Montserrat Medium": {
-    "Regular": {
-      "file": "Montserrat-Medium.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-MediumItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
-  "Montserrat SemiBold": {
-    "Regular": {
-      "file": "Montserrat-SemiBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-SemiBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
-  "Montserrat ExtraBold": {
-    "Regular": {
-      "file": "Montserrat-ExtraBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-ExtraBoldItalic.ttf",
-      "font-style": "italic",
-      "font-weight": "normal"
-    }
-  },
-  "Montserrat Black": {
-    "Regular": {
-      "file": "Montserrat-Black.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    },
-    "Italic": {
-      "file": "Montserrat-BlackItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic",
-    }
-  },
 
-  "Nunito": {
-    "Regular": {
-      "file": "Nunito-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Diner": {
+      "Regular": {
+        "file": "diner_.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
     },
-    "Italic": {
-      "file": "Nunito-Italic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-    "Bold": {
-      "file": "Nunito-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    },
-    "Bold Italic": {
-      "file": "Nunito-BoldItalic.ttf",
-      "font-style": "italic",
-      "font-weight": "bold"
-    },
-  },
 
-  "Nunito ExtraLight": {
-    "Regular": {
-      "file": "Nunito-ExtraLight.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Emilys Candy": {
+      "Regular": {
+        "file": "EmilysCandy-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
     },
-    "Italic": {
-      "file": "Nunito-ExtraLightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Nunito Light": {
-    "Regular": {
-      "file": "Nunito-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Great Vibes": {
+      "Regular": {
+        "file": "GreatVibes-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
     },
-    "Italic": {
-      "file": "Nunito-LightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Nunito SemiBold": {
-    "Regular": {
-      "file": "Nunito-SemiBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "FVE Harlow": {
+      "Regular": {
+        "file": "FVE_Harlow.ttf",
+        "font-weight": "normal",
+        "font-style": "normal",
+      }
     },
-    "Italic": {
-      "file": "Nunito-SemiBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Nunito ExtraBold": {
-    "Regular": {
-      "file": "Nunito-ExtraBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Montserrat": {
+      "Regular": {
+        "file": "Montserrat-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-Italic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      },
+      "Bold": {
+        "file": "Montserrat-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+      "Bold Italic": {
+        "file": "Montserrat-BoldItalic.ttf",
+        "font-weight": "bold",
+        "font-style": "italic",
+      }
+    },
+    "Montserrat Thin": {
+      "Regular": {
+        "file": "Montserrat-Thin.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-ThinItalic.ttf",
+        "font-style": "italic",
+        "font-weight": "normal"
+      }
+    },
+    "Montserrat ExtraLight": {
+      "Regular": {
+        "file": "Montserrat-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-ExtraLightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      }
+    },
+    "Montserrat Light": {
+      "Regular": {
+        "file": "Montserrat-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-LightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      }
+    },
+    "Montserrat Medium": {
+      "Regular": {
+        "file": "Montserrat-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-MediumItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      }
+    },
+    "Montserrat SemiBold": {
+      "Regular": {
+        "file": "Montserrat-SemiBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-SemiBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      }
+    },
+    "Montserrat ExtraBold": {
+      "Regular": {
+        "file": "Montserrat-ExtraBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-ExtraBoldItalic.ttf",
+        "font-style": "italic",
+        "font-weight": "normal"
+      }
+    },
+    "Montserrat Black": {
+      "Regular": {
+        "file": "Montserrat-Black.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Montserrat-BlackItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic",
+      }
     },
-    "Italic": {
-      "file": "Nunito-ExtraBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Nunito Black": {
-    "Regular": {
-      "file": "Nunito-Black.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Nunito": {
+      "Regular": {
+        "file": "Nunito-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-Italic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
+      "Bold": {
+        "file": "Nunito-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+      "Bold Italic": {
+        "file": "Nunito-BoldItalic.ttf",
+        "font-style": "italic",
+        "font-weight": "bold"
+      },
     },
-    "Italic": {
-      "file": "Nunito-BlackItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Open Sans": {
-    "Regular": {
-      "file": "OpenSans-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Nunito ExtraLight": {
+      "Regular": {
+        "file": "Nunito-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-ExtraLightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Italic": {
-      "file": "OpenSans-Italic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-    "Bold": {
-      "file": "OpenSans-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    },
-    "Bold Italic": {
-      "file": "OpenSans-BoldItalic.ttf",
-      "font-style": "italic",
-      "font-weight": "bold"
-    },
-  },
 
-  "Open Sans Light": {
-    "Regular": {
-      "file": "OpenSans-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Nunito Light": {
+      "Regular": {
+        "file": "Nunito-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-LightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Italic": {
-      "file": "OpenSans-LightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-  },
 
-  "Open Sans SemiBold": {
-    "Regular": {
-      "file": "OpenSans-SemiBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Nunito SemiBold": {
+      "Regular": {
+        "file": "Nunito-SemiBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-SemiBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Italic": {
-      "file": "OpenSans-SemiBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-  },
 
-  "Open Sans ExtraBold": {
-    "Regular": {
-      "file": "OpenSans-ExtraBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Nunito ExtraBold": {
+      "Regular": {
+        "file": "Nunito-ExtraBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-ExtraBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Italic": {
-      "file": "OpenSans-ExtraBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-  },
 
-  "Plaster": {
-    "Regular": {
-      "file": "Plaster-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Nunito Black": {
+      "Regular": {
+        "file": "Nunito-Black.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Nunito-BlackItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
+    },
 
-  "Playball": {
-    "Regular": {
-      "file": "Playball-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
-    }
-  },
+    "Open Sans": {
+      "Regular": {
+        "file": "OpenSans-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "OpenSans-Italic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
+      "Bold": {
+        "file": "OpenSans-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+      "Bold Italic": {
+        "file": "OpenSans-BoldItalic.ttf",
+        "font-style": "italic",
+        "font-weight": "bold"
+      },
+    },
 
-  "Poppins": {
-    "Regular": {
-      "file": "Poppins-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Open Sans Light": {
+      "Regular": {
+        "file": "OpenSans-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "OpenSans-LightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
     },
-    "Italic": {
-      "file": "Poppins-Italic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    },
-    "Bold": {
-      "file": "Poppins-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    },
-    "Bold Italic": {
-      "file": "Poppins-BoldItalic.ttf",
-      "font-style": "italic",
-      "font-weight": "bold"
-    },
-  },
 
-  "Poppins Thin": {
-    "Regular": {
-      "file": "Poppins-Thin.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Open Sans SemiBold": {
+      "Regular": {
+        "file": "OpenSans-SemiBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "OpenSans-SemiBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
     },
-    "Italic": {
-      "file": "Poppins-ThinItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Poppins ExtraLight": {
-    "Regular": {
-      "file": "Poppins-ExtraLight.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Open Sans ExtraBold": {
+      "Regular": {
+        "file": "OpenSans-ExtraBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "OpenSans-ExtraBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
     },
-    "Italic": {
-      "file": "Poppins-ExtraLightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Poppins Light": {
-    "Regular": {
-      "file": "Poppins-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Plaster": {
+      "Regular": {
+        "file": "Plaster-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
     },
-    "Italic": {
-      "file": "Poppins-LightItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Poppins SemiBold": {
-    "Regular": {
-      "file": "Poppins-SemiBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Playball": {
+      "Regular": {
+        "file": "Playball-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      }
     },
-    "Italic": {
-      "file": "Poppins-SemiBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Poppins ExtraBold": {
-    "Regular": {
-      "file": "Poppins-ExtraBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins": {
+      "Regular": {
+        "file": "Poppins-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-Italic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      },
+      "Bold": {
+        "file": "Poppins-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
+      "Bold Italic": {
+        "file": "Poppins-BoldItalic.ttf",
+        "font-style": "italic",
+        "font-weight": "bold"
+      },
     },
-    "Italic": {
-      "file": "Poppins-ExtraBoldItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Poppins Black": {
-    "Regular": {
-      "file": "Poppins-Black.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins Thin": {
+      "Regular": {
+        "file": "Poppins-Thin.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-ThinItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Italic": {
-      "file": "Poppins-BlackItalic.ttf",
-      "font-weight": "normal",
-      "font-style": "italic"
-    }
-  },
 
-  "Quicksand": {
-    "Regular": {
-      "file": "Quicksand-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins ExtraLight": {
+      "Regular": {
+        "file": "Poppins-ExtraLight.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-ExtraLightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-    "Bold": {
-      "file": "Quicksand-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    },
-  },
 
-  "Quicksand Light": {
-    "Regular": {
-      "file": "Quicksand-Light.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins Light": {
+      "Regular": {
+        "file": "Poppins-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-LightItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-  },
 
-  "Quicksand Medium": {
-    "Regular": {
-      "file": "Quicksand-Medium.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins SemiBold": {
+      "Regular": {
+        "file": "Poppins-SemiBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-SemiBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-  },
 
-  "Quicksand SemiBold": {
-    "Regular": {
-      "file": "Quicksand-SemiBold.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins ExtraBold": {
+      "Regular": {
+        "file": "Poppins-ExtraBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-ExtraBoldItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-  },
 
-  "Racing Sans One": {
-    "Regular": {
-      "file": "RacingSansOne-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Poppins Black": {
+      "Regular": {
+        "file": "Poppins-Black.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Italic": {
+        "file": "Poppins-BlackItalic.ttf",
+        "font-weight": "normal",
+        "font-style": "italic"
+      }
     },
-  },
 
-  "Sacramento": {
-    "Regular": {
-      "file": "Sacramento-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Quicksand": {
+      "Regular": {
+        "file": "Quicksand-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Bold": {
+        "file": "Quicksand-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      },
     },
-  },
 
-  "Special Elite": {
-    "Regular": {
-      "file": "SpecialElite-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Quicksand Light": {
+      "Regular": {
+        "file": "Quicksand-Light.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
     },
-  },
 
-  "Tangerine": {
-    "Regular": {
-      "file": "Tangerine-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Quicksand Medium": {
+      "Regular": {
+        "file": "Quicksand-Medium.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
     },
-    "Bold": {
-      "file": "Tangerine-Bold.ttf",
-      "font-weight": "bold",
-      "font-style": "normal"
-    }
-  },
 
-  "UnifrakturMaguntia": {
-    "Book": {
-      "file": "UnifrakturMaguntia-Regular.ttf",
-      "font-weight": "normal",
-      "font-style": "normal"
+    "Quicksand SemiBold": {
+      "Regular": {
+        "file": "Quicksand-SemiBold.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "RA BALI": {
+      "Regular": {
+        "file": "RA BALI.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Racing Sans One": {
+      "Regular": {
+        "file": "RacingSansOne-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Sacramento": {
+      "Regular": {
+        "file": "Sacramento-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Santana Script": {
+      "Regular": {
+        "file": "Santana-Script.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Sawarabi Mincho": {
+      "Regular": {
+        "file": "SawarabiMincho-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Special Elite": {
+      "Regular": {
+        "file": "SpecialElite-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Takota": {
+      "Takota": {
+        "file": "Takota.otf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+    },
+
+    "Tangerine": {
+      "Regular": {
+        "file": "Tangerine-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
+      "Bold": {
+        "file": "Tangerine-Bold.ttf",
+        "font-weight": "bold",
+        "font-style": "normal"
+      }
+    },
+
+    "UnifrakturMaguntia": {
+      "Book": {
+        "file": "UnifrakturMaguntia-Regular.ttf",
+        "font-weight": "normal",
+        "font-style": "normal"
+      },
     },
   }
 };
 
-populateFonts(fonts);
\ No newline at end of file
+populateFonts(charsetFonts);
+
+const fonts = {...charsetFonts["Japanese Character Set"], ...charsetFonts["Latin Character Set"]};
\ No newline at end of file
diff --git a/src/js/lib/css.min.js b/src/js/lib/css.min.js
new file mode 100644
index 0000000..5fece1e
--- /dev/null
+++ b/src/js/lib/css.min.js
@@ -0,0 +1,3 @@
+/*! css.js 27-02-2018 */
+
+!function(e){"use strict";var t=function(){this.cssImportStatements=[],this.cssKeyframeStatements=[],this.cssRegex=new RegExp("([\\s\\S]*?){([\\s\\S]*?)}","gi"),this.cssMediaQueryRegex="((@media [\\s\\S]*?){([\\s\\S]*?}\\s*?)})",this.cssKeyframeRegex="((@.*?keyframes [\\s\\S]*?){([\\s\\S]*?}\\s*?)})",this.combinedCSSRegex="((\\s*?(?:\\/\\*[\\s\\S]*?\\*\\/)?\\s*?@media[\\s\\S]*?){([\\s\\S]*?)}\\s*?})|(([\\s\\S]*?){([\\s\\S]*?)})",this.cssCommentsRegex="(\\/\\*[\\s\\S]*?\\*\\/)",this.cssImportStatementRegex=new RegExp("@import .*?;","gi")};t.prototype.stripComments=function(e){var t=new RegExp(this.cssCommentsRegex,"gi");return e.replace(t,"")},t.prototype.parseCSS=function(e){if(void 0===e)return[];for(var t=[];;){var s=this.cssImportStatementRegex.exec(e);if(null===s)break;this.cssImportStatements.push(s[0]),t.push({selector:"@imports",type:"imports",styles:s[0]})}e=e.replace(this.cssImportStatementRegex,"");for(var r,i=new RegExp(this.cssKeyframeRegex,"gi");null!==(r=i.exec(e));)t.push({selector:"@keyframes",type:"keyframes",styles:r[0]});e=e.replace(i,"");for(var n=new RegExp(this.combinedCSSRegex,"gi");null!==(r=n.exec(e));){var o="";o=void 0===r[2]?r[5].split("\r\n").join("\n").trim():r[2].split("\r\n").join("\n").trim();var l=new RegExp(this.cssCommentsRegex,"gi"),p=l.exec(o);if(null!==p&&(o=o.replace(l,"").trim()),-1!==(o=o.replace(/\n+/,"\n")).indexOf("@media")){var a={selector:o,type:"media",subStyles:this.parseCSS(r[3]+"\n}")};null!==p&&(a.comments=p[0]),t.push(a)}else{var c={selector:o,rules:this.parseRules(r[6])};"@font-face"===o&&(c.type="font-face"),null!==p&&(c.comments=p[0]),t.push(c)}}return t},t.prototype.parseRules=function(e){var t=[];e=(e=e.split("\r\n").join("\n")).split(";");for(var s=0;s<e.length;s++){var r=e[s];if(-1!==(r=r.trim()).indexOf(":")){var i=(r=r.split(":"))[0].trim(),n=r.slice(1).join(":").trim();if(i.length<1||n.length<1)continue;t.push({directive:i,value:n})}else"base64,"===r.trim().substr(0,7)?t[t.length-1].value+=r.trim():r.length>0&&t.push({directive:"",value:r,defective:!0})}return t},t.prototype.findCorrespondingRule=function(e,t,s){void 0===s&&(s=!1);for(var r=!1,i=0;i<e.length&&(e[i].directive!==t||(r=e[i],s!==e[i].value));i++);return r},t.prototype.findBySelector=function(e,t,s){void 0===s&&(s=!1);for(var r=[],i=0;i<e.length;i++)!1===s?e[i].selector===t&&r.push(e[i]):-1!==e[i].selector.indexOf(t)&&r.push(e[i]);if("@imports"===t||r.length<2)return r;var n=r[0];for(i=1;i<r.length;i++)this.intelligentCSSPush([n],r[i]);return[n]},t.prototype.deleteBySelector=function(e,t){for(var s=[],r=0;r<e.length;r++)e[r].selector!==t&&s.push(e[r]);return s},t.prototype.compressCSS=function(e){for(var t=[],s={},r=0;r<e.length;r++){var i=e[r];if(!0!==s[i.selector]){var n=this.findBySelector(e,i.selector);0!==n.length&&(t=t.concat(n),s[i.selector]=!0)}}return t},t.prototype.cssDiff=function(e,t){if(e.selector!==t.selector)return!1;if("media"===e.type||"media"===t.type)return!1;for(var s,r,i={selector:e.selector,rules:[]},n=0;n<e.rules.length;n++)s=e.rules[n],!1===(r=this.findCorrespondingRule(t.rules,s.directive,s.value))?i.rules.push(s):s.value!==r.value&&i.rules.push(s);for(var o=0;o<t.rules.length;o++)r=t.rules[o],!1===(s=this.findCorrespondingRule(e.rules,r.directive))&&(r.type="DELETED",i.rules.push(r));return 0!==i.rules.length&&i},t.prototype.intelligentMerge=function(e,t,s){void 0===s&&(s=!1);for(var r=0;r<t.length;r++)this.intelligentCSSPush(e,t[r],s);for(r=0;r<e.length;r++){var i=e[r];"media"!==i.type&&"keyframes"!==i.type&&(i.rules=this.compactRules(i.rules))}},t.prototype.intelligentCSSPush=function(e,t,s){var r=t.selector,i=!1;if(void 0===s&&(s=!1),!1===s){for(var n=0;n<e.length;n++)if(e[n].selector===r){i=e[n];break}}else for(var o=e.length-1;o>-1;o--)if(e[o].selector===r){i=e[o];break}if(!1===i)e.push(t);else if("media"!==t.type)for(var l=0;l<t.rules.length;l++){var p=t.rules[l],a=this.findCorrespondingRule(i.rules,p.directive);!1===a?i.rules.push(p):"DELETED"===p.type?a.type="DELETED":a.value=p.value}else i.subStyles=i.subStyles.concat(t.subStyles)},t.prototype.compactRules=function(e){for(var t=[],s=0;s<e.length;s++)"DELETED"!==e[s].type&&t.push(e[s]);return t},t.prototype.getCSSForEditor=function(e,t){void 0===t&&(t=0);var s="";void 0===e&&(e=this.css);for(var r=0;r<e.length;r++)"imports"===e[r].type&&(s+=e[r].styles+"\n\n");for(r=0;r<e.length;r++){var i=e[r];if(void 0!==i.selector){var n="";void 0!==i.comments&&(n=i.comments+"\n"),"media"===i.type?(s+=n+i.selector+"{\n",s+=this.getCSSForEditor(i.subStyles,t+1),s+="}\n\n"):"keyframes"!==i.type&&"imports"!==i.type&&(s+=this.getSpaces(t)+n+i.selector+" {\n",s+=this.getCSSOfRules(i.rules,t+1),s+=this.getSpaces(t)+"}\n\n")}}for(r=0;r<e.length;r++)"keyframes"===e[r].type&&(s+=e[r].styles+"\n\n");return s},t.prototype.getImports=function(e){for(var t=[],s=0;s<e.length;s++)"imports"===e[s].type&&t.push(e[s].styles);return t},t.prototype.getCSSOfRules=function(e,t){for(var s="",r=0;r<e.length;r++)void 0!==e[r]&&(void 0===e[r].defective?s+=this.getSpaces(t)+e[r].directive+": "+e[r].value+";\n":s+=this.getSpaces(t)+e[r].value+";\n");return s||"\n"},t.prototype.getSpaces=function(e){for(var t="",s=0;s<4*e;s++)t+=" ";return t},t.prototype.applyNamespacing=function(e,t){var s=e,r="."+this.cssPreviewNamespace;void 0!==t&&(r=t),"string"==typeof e&&(s=this.parseCSS(e));for(var i=0;i<s.length;i++){var n=s[i];if(!(n.selector.indexOf("@font-face")>-1||n.selector.indexOf("keyframes")>-1||n.selector.indexOf("@import")>-1||n.selector.indexOf(".form-all")>-1||n.selector.indexOf("#stage")>-1))if("media"!==n.type){for(var o=n.selector.split(","),l=[],p=0;p<o.length;p++)-1===o[p].indexOf(".supernova")?l.push(r+" "+o[p]):l.push(o[p]);n.selector=l.join(",")}else n.subStyles=this.applyNamespacing(n.subStyles,t)}return s},t.prototype.clearNamespacing=function(e,t){void 0===t&&(t=!1);var s=e,r="."+this.cssPreviewNamespace;"string"==typeof e&&(s=this.parseCSS(e));for(var i=0;i<s.length;i++){var n=s[i];if("media"!==n.type){for(var o=n.selector.split(","),l=[],p=0;p<o.length;p++)l.push(o[p].split(r+" ").join(""));n.selector=l.join(",")}else n.subStyles=this.clearNamespacing(n.subStyles,!0)}return!1===t?this.getCSSForEditor(s):s},t.prototype.createStyleElement=function(e,t,s){if(void 0===s&&(s=!1),!1===this.testMode&&"nonamespace"!==s&&(t=this.applyNamespacing(t)),"string"!=typeof t&&(t=this.getCSSForEditor(t)),!0===s&&(t=this.getCSSForEditor(this.parseCSS(t))),!1!==this.testMode)return this.testMode("create style #"+e,t);var r=document.getElementById(e);r&&r.parentNode.removeChild(r);var i=document.head||document.getElementsByTagName("head")[0],n=document.createElement("style");n.id=e,n.type="text/css",i.appendChild(n),n.styleSheet&&!n.sheet?n.styleSheet.cssText=t:n.appendChild(document.createTextNode(t))},e.cssjs=t}(this);
\ No newline at end of file
diff --git a/src/js/start.js b/src/js/start.js
index 178bdaf..ef114d7 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -7,8 +7,8 @@ editor.modal = {
   about: new MD.Modal({
     html: `
       <h1>About this application</h1>
-      <p>Method Draw is a simple <a href="https://github.com/methodofaction/Method-Draw">open source</a> vector drawing application. Method Draw was forked from <a href="https://github.com/SVG-Edit/svgedit">SVG-Edit</a> several years ago with the goal of improving and modernizing the interface.</p>
-      <p>At this time (2021), the author (<a href="http://method.ac/writing">Mark MacKay</a>) is working on improving stability and improving the codebase, which contains a lot of legacy practices. The goal is to create a vector editor suitable for simple graphic design tasks.</p>
+      <p>Fujikohsan Vector Editor is a vector drawing application by Fuji Kosan Co., Ltd. from Tokyo, Japan. Fujikohsan specializes in uniforms, safety clothes, and promotional goods.</p>
+      <p>Visit our website at <a target="_blank" href="https://fujikohsan.co.jp/">fujikohsan.co.jp</a>
       `
   }),
   source: new MD.Modal({
diff --git a/src/js/svgcanvas.js b/src/js/svgcanvas.js
index 59473c2..2f41849 100644
--- a/src/js/svgcanvas.js
+++ b/src/js/svgcanvas.js
@@ -49,7 +49,8 @@ var curConfig = {
   initFill: {color: 'fff', opacity: 1},
   initStroke: {width: 1, color: '000', opacity: 1},
   imgPath: 'images/',
-  baseUnit: 'px'
+  baseUnit: 'px',
+  defaultFont: "Noto Sans JP"
 };
 
 // Update config with new one if given
@@ -146,7 +147,7 @@ $.extend(all_properties.text, {
   fill: "#000000",
   stroke_width: 0,
   font_size: 24,
-  font_family: 'sans-serif'
+  font_family: curConfig.defaultFont
 });
 
 // Current shape style properties
@@ -569,15 +570,11 @@ getStrokedBBox = this.getStrokedBBox = function(elems) {
       var angle = svgedit.utilities.getRotationAngle(elem);
       if ((angle && angle % 90) ||
           svgedit.math.hasMatrixTransform(svgedit.transformlist.getTransformList(elem))) {
-        // Accurate way to get BBox of rotated element in Firefox:
-        // Put element in group and get its BBox
-        
-        var good_bb = false;
         
         // Get the BBox from the raw path for these elements
         var elemNames = ['ellipse','path','line','polyline','polygon'];
         if(elemNames.indexOf(elem.tagName) >= 0) {
-          bb = good_bb = canvas.convertToPath(elem, true);
+          bb = canvas.convertToPath(elem, true);
         } else if(elem.tagName == 'rect') {
           // Look for radius
           var rx = elem.getAttribute('rx');
@@ -586,51 +583,6 @@ getStrokedBBox = this.getStrokedBBox = function(elems) {
             bb = good_bb = canvas.convertToPath(elem, true);
           }
         }
-        
-        if(!good_bb) {
-          // Must use clone else FF freaks out
-          var clone = elem.cloneNode(true); 
-          var g = document.createElementNS(svgns, "g");
-          var parent = elem.parentNode;
-          parent.appendChild(g);
-          g.appendChild(clone);
-          bb = svgedit.utilities.bboxToObj(g.getBBox());
-          parent.removeChild(g);
-        }
-        
-
-        // Old method: Works by giving the rotated BBox,
-        // this is (unfortunately) what Opera and Safari do
-        // natively when getting the BBox of the parent group
-//            var angle = angle * Math.PI / 180.0;
-//            var rminx = Number.MAX_VALUE, rminy = Number.MAX_VALUE, 
-//              rmaxx = Number.MIN_VALUE, rmaxy = Number.MIN_VALUE;
-//            var cx = round(bb.x + bb.width/2),
-//              cy = round(bb.y + bb.height/2);
-//            var pts = [ [bb.x - cx, bb.y - cy], 
-//                  [bb.x + bb.width - cx, bb.y - cy],
-//                  [bb.x + bb.width - cx, bb.y + bb.height - cy],
-//                  [bb.x - cx, bb.y + bb.height - cy] ];
-//            var j = 4;
-//            while (j--) {
-//              var x = pts[j][0],
-//                y = pts[j][1],
-//                r = Math.sqrt( x*x + y*y );
-//              var theta = Math.atan2(y,x) + angle;
-//              x = round(r * Math.cos(theta) + cx);
-//              y = round(r * Math.sin(theta) + cy);
-//    
-//              // now set the bbox for the shape after it's been rotated
-//              if (x < rminx) rminx = x;
-//              if (y < rminy) rminy = y;
-//              if (x > rmaxx) rmaxx = x;
-//              if (y > rmaxy) rmaxy = y;
-//            }
-//            
-//            bb.x = rminx;
-//            bb.y = rminy;
-//            bb.width = rmaxx - rminx;
-//            bb.height = rmaxy - rminy;
       }
       return bb;
     } catch(e) { 
@@ -856,6 +808,7 @@ var getId, getNextId, call;
 // Parameters:
 // newDoc - The SVG DOM document
 this.prepareSvg = function(newDoc) {
+
   this.sanitizeSvg(newDoc.documentElement);
 
   // convert paths into absolute commands
@@ -865,6 +818,7 @@ this.prepareSvg = function(newDoc) {
     path.setAttribute('d', pathActions.convertPath(path));
     pathActions.fixEnd(path);
   }
+
 };
 
 // Function getRefElem
@@ -1286,8 +1240,18 @@ var updateClipPath = function(attr, tx, ty) {
 // Undo command object with the resulting change
 var recalculateDimensions = this.recalculateDimensions = function(selected) {
   if (selected == null) return null;
-  
   var tlist = getTransformList(selected);
+
+  // apply transformation to path and to text if is textpath
+  const textPath = selected.querySelector("textPath");
+  if (textPath) {
+    return false;
+    const href = textPath.getAttribute("href");
+    const id = href.replace("#", "");
+    const path = svgroot.getElementById(id);
+    //recalculateDimensions(selected, true);
+    if (path) selected = path;
+  }
   
   // remove any unnecessary transforms
   if (tlist && tlist.numberOfItems > 0) {
@@ -1313,7 +1277,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
     // End here if all it has is a rotation
     if(tlist.numberOfItems === 1 && getRotationAngle(selected)) return null;
   }
-  
+
   // if this element had no transforms, we are done
   if (!tlist || tlist.numberOfItems == 0) {
     selected.removeAttribute("transform");
@@ -1399,6 +1363,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
     case "use":
     case "text":
     case "tspan":
+    case "textPath":
       attrs = ["x", "y"];
       break;
     case "polygon":
@@ -2263,7 +2228,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
     if(mouse_target.tagName === 'a' && mouse_target.childNodes.length === 1) {
       mouse_target = mouse_target.firstChild;
     }
-    
+
     // real_x/y ignores grid-snap value
     var real_x = r_start_x = start_x = x;
     var real_y = r_start_y = start_y = y;
@@ -2339,10 +2304,6 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
           }
           r_start_x *= current_zoom;
           r_start_y *= current_zoom;
-//          console.log('p',[evt.pageX, evt.pageY]);          
-//          console.log('c',[evt.clientX, evt.clientY]);  
-//          console.log('o',[evt.offsetX, evt.offsetY]);  
-//          console.log('s',[start_x, start_y]);
           
           assignAttributes(rubberBox, {
             'x': r_start_x,
@@ -3104,7 +3065,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
       case "select":
         if (selectedElements[0] != null) {
           // if we only have one selected element
-          if (selectedElements.length == 1) {
+          if (selectedElements.length === 1) {
             // set our current stroke/fill properties to the element's
             var selected = selectedElements[0];
             switch ( selected.tagName ) {
@@ -3556,7 +3517,7 @@ var textActions = canvas.textActions = function() {
       selblock = document.createElementNS(svgns, "path");
       assignAttributes(selblock, {
         'id': "text_selectblock",
-        'fill': "green",
+        'fill': "blue",
         'opacity': .5,
         'style': "pointer-events:none"
       });
@@ -5128,13 +5089,6 @@ this.svgCanvasToString = function() {
   
   pathActions.clear(true);
   
-  // Keep SVG-Edit comment on top
-  $.each(svgcontent.childNodes, function(i, node) {
-    if(i && node.nodeType === 8 && node.data.indexOf('Created with') >= 0) {
-      svgcontent.insertBefore(node, svgcontent.firstChild);
-    }
-  });
-  
   // Move out of in-group editing mode
   if(current_group) {
     leaveContext();
@@ -5162,6 +5116,7 @@ this.svgCanvasToString = function() {
       $(this).replaceWith(svg);
     }
   });
+
   var output = this.svgToString(svgcontent, 0);
   
   // Rewrap gsvg
@@ -5171,6 +5126,8 @@ this.svgCanvasToString = function() {
     });
   }
   
+
+  
   return output;
 };
 
@@ -5202,17 +5159,6 @@ this.svgToString = function(elem, indent) {
       var res = getResolution();
       
       var vb = "";
-      // TODO: Allow this by dividing all values by current baseVal
-      // Note that this also means we should properly deal with this on import
-//      if(curConfig.baseUnit !== "px") {
-//        var unit = curConfig.baseUnit;
-//        var unit_m = svgedit.units.getTypeMap()[unit];
-//        res.w = svgedit.units.shortFloat(res.w / unit_m)
-//        res.h = svgedit.units.shortFloat(res.h / unit_m)
-//        vb = ' viewBox="' + [0, 0, res.w, res.h].join(' ') + '"';       
-//        res.w += unit;
-//        res.h += unit;
-//      }
       
       if(unit !== "px") {
         res.w = svgedit.units.convertUnit(res.w, unit) + unit;
@@ -5220,7 +5166,7 @@ this.svgToString = function(elem, indent) {
       }
       
       out.push(' width="' + res.w + '" height="' + res.h + '"' + vb + ' xmlns="'+svgns+'"');
-      
+
       var nsuris = {};
       
       // Check elements for namespaces, add if found
@@ -5401,9 +5347,11 @@ this.save = function() {
   
   // no need for doctype, see http://jwatt.org/svg/authoring/#doctype-declaration
   var str = this.svgCanvasToString();
+  if (str.includes(" href=")) str = str.replace(" href=", " xlink:href=");
+  console.log(str)
   var blob = new Blob([ str ], {type: "image/svg+xml;charset=utf-8"});
   var dropAutoBOM = true;
-  saveAs(blob, "method-draw-image.svg", dropAutoBOM);
+  saveAs(blob, "FVE-image.svg", dropAutoBOM);
 };
 
 // Function: rasterExport
@@ -5780,6 +5728,23 @@ var convertToGroup = this.convertToGroup = function(elem) {
   }
 }
 
+this.styleToAttr = function(doc) {
+  const docEl = doc.documentElement;
+  const styles = docEl.querySelectorAll("style");
+  var parser = new cssjs();
+  styles.forEach(style =>{
+    var parsed = parser.parseCSS(style.textContent);
+    parsed.forEach(ruleset => {
+      const els = docEl.querySelectorAll(ruleset.selector);
+      els.forEach(el => {
+        ruleset.rules.forEach(rule => el.setAttribute(rule.directive, rule.value));
+      })
+    })
+  });
+  styles.forEach(style => {style.parentNode.removeChild(style)});
+  return doc;
+}
+
 //   
 // Function: setSvgString
 // This function sets the current drawing as the input SVG XML.
@@ -5793,6 +5758,7 @@ this.setSvgString = function(xmlString) {
   try {
     // convert string into XML document
     var newDoc = svgedit.utilities.text2xml(xmlString);
+    this.styleToAttr(newDoc);
     this.prepareSvg(newDoc);
 
     var batchCmd = new BatchCommand("Change Source");
@@ -7176,6 +7142,25 @@ this.setStrokeAttr = function(attr, val) {
   }
 };
 
+this.setTextPathAttr = function(attr, val) {
+  cur_shape[attr.replace('-','_')] = val;
+  var elems = [];
+  var i = selectedElements.length;
+  while (i--) {
+    var elem = selectedElements[i];
+    if (elem) {
+      if (elem.tagName === "text") {
+        const textPath = elem.querySelector("textPath");
+        if (textPath) elems.push(textPath)
+      }
+    }
+  }
+  if (elems.length > 0) {
+    changeSelectedAttribute(attr, val, elems);
+    call("changed", selectedElements);
+  }
+};
+
 // Function: getStyle
 // Returns current style options
 this.getStyle = function() {
@@ -7505,11 +7490,65 @@ this.getText = function() {
 // Parameters:
 // val - String with the new text
 this.setTextContent = function(val) {
-  changeSelectedAttribute("#text", val);
+  const selected = selectedElements[0];
+  const textPath = selected.querySelector("textPath");
+  changeSelectedAttribute("#text", val, textPath ? [textPath] : null);
   textActions.init(val);
   textActions.setCursor();
 };
 
+this.textPath = function(){
+  const text = selectedElements.find(element => element.tagName === "text");
+  var path = selectedElements.find(element => element.tagName === "path" || element.tagName === "ellipse");
+  if (path.tagName === "ellipse") {
+    console.log("ellipse")
+  }
+  if (!text || !path) return false;
+  const textPath = svgdoc.createElementNS(svgns, "textPath");
+  textPath.textContent = text.textContent;
+  text.textContent = "";
+  text.setAttribute("text-anchor", "middle");
+  text.setAttribute("x", 0);
+  text.setAttribute("y", 0);
+  textPath.setAttribute("xlink:href", "#" + path.id);
+  textPath.setAttribute("href", "#" + path.id);
+  const offset = (path.getTotalLength()/2).toFixed(0)
+  textPath.setAttribute("startOffset", offset);
+  text.appendChild(textPath);
+  findDefs().appendChild(path);
+  selectorManager.releaseSelector(path);
+  selectorManager.requestSelector(text).resize();
+  call("changed", [textPath]);
+  return text;
+}
+
+this.releaseTextPath = function(){
+  const text = selectedElements.find(element => element.tagName === "text");
+  const textPath = text.querySelector("textPath");
+  const content = textPath.textContent;
+  if (!text) return false;
+  const path = svgCanvas.getTextPath(text);
+  if (!text || !path) return false;
+  text.removeChild(textPath);
+  text.textContent = content;
+  getCurrentDrawing().getCurrentLayer().appendChild(path);
+  const bb = path.getBBox();
+  text.setAttribute("x", bb.x);
+  text.setAttribute("y", bb.y);
+  return text;
+}
+
+this.getTextPath = function(elem){
+  const textPath = elem.querySelector("textPath");
+  var path = null;
+  if (textPath) {
+    const href = textPath.getAttribute("href");
+    const id = href.replace("#", "");
+    path = svgroot.getElementById(id);
+  }
+  return path;
+}
+
 // Function: setImageURL
 // Sets the new image URL for the selected image element. Updates its size if
 // a new URL is given
@@ -7743,15 +7782,24 @@ this.convertToPath = function(elem, getBBox) {
     if(elem.tagName == 'circle') {
       rx = ry = $(elem).attr('r');
     }
-  
+
     joinSegs([
-      ['M',[(cx-rx),(cy)]],
+      ['M',[(cx),(cy+ry)]], //
+      ['C',[(cx-rx/num),(cy+ry), (cx-rx),(cy+ry/num), (cx-rx),(cy)]],
       ['C',[(cx-rx),(cy-ry/num), (cx-rx/num),(cy-ry), (cx),(cy-ry)]],
       ['C',[(cx+rx/num),(cy-ry), (cx+rx),(cy-ry/num), (cx+rx),(cy)]],
       ['C',[(cx+rx),(cy+ry/num), (cx+rx/num),(cy+ry), (cx),(cy+ry)]],
-      ['C',[(cx-rx/num),(cy+ry), (cx-rx),(cy+ry/num), (cx-rx),(cy)]],
       ['Z',[]]
     ]);
+  
+    //joinSegs([
+    //  ['M',[(cx-rx),(cy)]], //
+    //  ['C',[(cx-rx),(cy-ry/num), (cx-rx/num),(cy-ry), (cx),(cy-ry)]],
+    //  ['C',[(cx+rx/num),(cy-ry), (cx+rx),(cy-ry/num), (cx+rx),(cy)]],
+    //  ['C',[(cx+rx),(cy+ry/num), (cx+rx/num),(cy+ry), (cx),(cy+ry)]],
+    //  ['C',[(cx-rx/num),(cy+ry), (cx-rx),(cy+ry/num), (cx-rx),(cy)]],
+    //  ['Z',[]]
+    //]);
     break;
   case 'path':
     d = elem.getAttribute('d');
@@ -7857,6 +7905,19 @@ var changeSelectedAttributeNoUndo = this.changeSelectedAttributeNoUndo = functio
       pathActions.moveNode(attr, newValue);
     }
     var elems = elems || selectedElements;
+
+    // get the path instead of text if is textPath
+    //elems = elems.map((elem) => {
+    //  if (elem.tagName === 'text') {
+    //    const path = svgCanvas.getTextPath(elem);
+    //    console.log(path)
+    //    if (path) elem = path;
+    //  }
+    //  return elem;
+    //});
+
+
+
     var i = elems.length;
     var no_xy_elems = ['g', 'polyline', 'path'];
     var good_g_attrs = ['transform', 'opacity', 'filter'];
@@ -7880,7 +7941,7 @@ var changeSelectedAttributeNoUndo = this.changeSelectedAttributeNoUndo = functio
       var oldval = attr === "#text" ? elem.textContent : elem.getAttribute(attr);
       if (oldval == null)  oldval = "";
       if (oldval !== String(newValue)) {
-        if (attr == "#text") {
+        if (attr === "#text") {
           var old_w = svgedit.utilities.getBBox(elem).width;
           elem.textContent = newValue;
 
diff --git a/src/js/svgutils.js b/src/js/svgutils.js
index 540bb97..d323362 100644
--- a/src/js/svgutils.js
+++ b/src/js/svgutils.js
@@ -482,9 +482,11 @@ function groupBBFix(selected) {
 // elem - Optional DOM element to get the BBox for
 svgedit.utilities.getBBox = function(elem) {
   var selected = elem || editorContext_.getSelectedElements()[0];
+  if (selected.nodeName === "textPath") selected = elem.parentNode;
   if (elem.nodeType != 1) return null;
   var ret = null;
   var elname = selected.nodeName;
+
   
   switch ( elname ) {
   case 'text':