From 47b1c144ac0a9c04b559a977e614a79a9ad4a983 Mon Sep 17 00:00:00 2001
From: Azgaar <maxganiev@yandex.ru>
Date: Thu, 18 Feb 2021 18:52:59 +0300
Subject: [PATCH] v1.5.40 charges update from API

---
 charges/annulet.svg                  | 2 +-
 charges/bullHeadCaboshed.svg         | 2 +-
 charges/bullPassant.svg              | 2 +-
 charges/cancer.svg                   | 2 +-
 charges/{сarreau.svg => carreau.svg} | 0
 charges/cock.svg                     | 2 +-
 charges/compassRose.svg              | 2 +-
 charges/crown.svg                    | 2 +-
 charges/escallop.svg                 | 4 ++--
 charges/lozengeFaceted.svg           | 6 +++---
 charges/mullet6Pierced.svg           | 2 +-
 charges/mulletPierced.svg            | 2 +-
 modules/coa-generator.js             | 2 +-
 13 files changed, 15 insertions(+), 15 deletions(-)
 rename charges/{сarreau.svg => carreau.svg} (100%)

diff --git a/charges/annulet.svg b/charges/annulet.svg
index 976c2474..2677e045 100644
--- a/charges/annulet.svg
+++ b/charges/annulet.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--Author: Azgaar. License: Public Domain-->
   <g id="annulet">
-    <path d="M70 100a30 30 0 1060 0 30 30 0 10-60 0m10 0a20 20 0 1140 0 20 20 0 11-40 0"/>
+    <path d="M70 100c0 16.569 13.431 30 30 30 16.569 0 30-13.431 30-30 0-16.569-13.431-30-30-30-16.569 0-30 13.431-30 30m10 0c0-11.046 8.954-20 20-20s20 8.954 20 20-8.954 20-20 20-20-8.954-20-20"/>
   </g>
 </svg>
diff --git a/charges/bullHeadCaboshed.svg b/charges/bullHeadCaboshed.svg
index 65112450..88ae177e 100644
--- a/charges/bullHeadCaboshed.svg
+++ b/charges/bullHeadCaboshed.svg
@@ -4,9 +4,9 @@
     <path d="M111.33 86.02c1.3-.92 2.46-3.23 3.68-4.16 0 0 .76.01 1.7-.66 2.22-1.56 1.93-3.93 1.39-5.24-2.15-5.21-12.23-3.2-16.1-9.99-1.78-3.1-.49-6.9.61-7.31.77-.3-.17 1.61 1 3.44 3.89 6.1 17.3 2.58 23.27 11.02a10.4 10.4 0 011.83 5.84c.26 8.81-8.43 11.97-11.67 12.48-1.72 1.72-2.53-.01-4.2-.01m-24.08-5.41c-1.3-.92-2.45-3.23-3.68-4.16 0 0-.76.01-1.7-.66-2.22-1.56-1.93-3.93-1.39-5.24 2.15-5.21 12.23-3.2 16.1-9.99 1.78-3.1.49-6.9-.61-7.31-.77-.3.17 1.61-1 3.44-4.04 6.35-17.42 2.46-23.27 10.72-1.4 1.96-1.77 4.35-1.83 6.14-.26 8.81 8.44 11.97 11.67 12.48 1.72 1.72 2.53-.01 4.2-.01"/>
     <path d="M114.73 92.4s3.4-1.7 5.41-1.7c3.65 0 5.83 2.27 8.87 2.27 1.83 0 3.4-.85 4.06-1.27.32-.09.3.03.33.23-.08 1.23-1.67 4.56-4.9 6.32-.28.7-2.24 1.92-3.04 1.92-.3.24-1.07.94-3.5.94-3.4 0-7.16-1.94-7.16-2.42M85.21 92.4s-3.4-1.7-5.4-1.7c-3.65 0-5.84 2.27-8.87 2.27-1.83 0-3.4-.85-4.07-1.27-.31-.09-.3.03-.32.23.07 1.23 1.67 4.56 4.9 6.32.28.7 2.23 1.92 3.04 1.92.3.24 1.07.94 3.5.94 3.4 0 7.16-1.94 7.16-2.42"/>
     <path d="M82.7 91.7c-.82 4.79 1.36 5.5 1.24 6.75-1.6 5.22 1.35 6.57 1.35 9 0 1.78.22 1.69.68 3.84.26 1.7 1.8 3.79 2.81 5.78.25.5 1.06 3.97 1.06 4.27 0 .14-1.03 1.82-1.03 4.48 0 3.66 2.14 5.8 3.59 5.8 4.5 0 5.28-.47 7.57-.47 2.3 0 3.06.48 7.58.48 1.45 0 3.58-2.15 3.58-5.8 0-2.67-1.02-4.35-1.02-4.49 0-.3.8-3.78 1.05-4.27 1.01-2 2.56-4.07 2.82-5.78.45-2.15.68-2.06.68-3.84 0-2.43 2.96-3.77 1.35-9-.14-1.25 2.06-1.95 1.23-6.75l-.19-.25c-2.25-1.44-2.4-6.7-1.99-9.5-1.04-1.08-3.32-1.57-6.75-1.57s-5.92 1.2-8.34 1.2c-2.41 0-4.9-1.2-8.33-1.2s-5.71.49-6.76 1.57c.42 2.8.28 8.06-1.99 9.5l-.18.25z"/>
+    <path fill="#F2BC51" d="m 108.72,124.86 c -0.13,0.71 -0.84,1.42 -1.24,1.68 0.75,1.32 1.19,2.81 1.2,4.34 0.026,4.78 -3.88,8.67 -8.67,8.67 -4.78,0 -8.67,-3.88 -8.67,-8.67 0,-1.55 0.5,-3.1 1.2,-4.35 -0.63,-0.42 -1.02,-1.04 -1.22,-1.7 -1.22,1.7851 -1.92,3.89 -1.93,6.06 -0.02,5.87 4.75,10.63 10.63,10.63 5.87,0 10.67,-4.75 10.63,-10.63 -0.01,-2.15 -0.72,-4.24 -1.93,-6.03 z"/>
     <path fill="#F6F6F6" d="M111 100.6c0 .43.68 1.2 2.3 1.2 1.22 0 1.83-2.59 1.83-2.8 0-.22-.03-1.36-1.13-1.36-1.2-.01-3 2.99-3 2.96zm-22.04 0c0 .43-.68 1.2-2.3 1.2-1.23 0-1.83-2.59-1.83-2.8 0-.22.03-1.36 1.13-1.36 1.19-.01 3 2.99 3 2.96z"/>
     <path fill="none" stroke-width=".22" d="M112.08 91.93c-.42.47-1.18.92-2.48 1.11-.23.01-.3-.05-.2-.17.47-.6.6-1.19.6-1.67m-2.7 1.4c-.52.38-1.3.7-2.5.9-.16.04-.35.14-.23-.1.42-1-.09-2.3-.09-2.3m-1.43 1.75c-.23.5-.4 1.1-.38 1.77.01.21-.09.21-.34.16a2.14 2.14 0 01-1.55-1m-.56-2s-.2 1.93-2.3 2.42c-.2.01-.34.1-.48-.08.34-.49.35-.87.18-1.2m-2-1.34c-.3.52-.62 1.05-.05 1.77.16.26-.05.24-.28.2-1.27-.22-1.8-.68-2.05-1.21m-1.7-1.83c.62 1.03-1.41 1.35-.25 2.33.03.29-.2.3-.49.3-1.68 0-2.32-.72-2.8-1.5"/>
-    <path fill="#F2BC51" d="M108.72 124.86l-.12.38a2.54 2.54 0 01-.59.9c-.17.17-.36.3-.53.4a9.2 9.2 0 011.2 4.34 8.67 8.67 0 11-17.34 0c0-1.55.5-3.1 1.2-4.35a3 3 0 01-.84-.8 3.09 3.09 0 01-.38-.9 10.97 10.97 0 00-1.93 6.06 10.63 10.63 0 1021.26 0 11.3 11.3 0 00-1.93-6.03z"/>
     <g fill="#000" stroke="none">
       <path d="M95.78 67.1c.23.58-1.3 1.41-1 .97.39-.28.68-.64 1-.97zm-2.04.97c.16.73-.75 1.4-1.41 1.09a1.65 1.65 0 001.41-1.09zm-1.88.78c-.07.53-.9.93-1.16.82.4-.27.79-.53 1.16-.82zM74.02 81.99c-.03.68.8 2.66-.05 1.18-.12-.38-.14-.82.05-1.18zm1.23 2.18c.28.54.67 1.72.01.69a.87.87 0 01-.01-.69zm1.47 1.73c.02.31.8 1.35.12.82-.22-.2-.26-.56-.12-.82zm1.56 1.27c-.09.5 1.32 1.53.7 1.36a1.3 1.3 0 01-.7-1.36zm5.36-5.65c-1.44-.67-3-1.95-2.96-3.68.08 1.68 1.64 2.82 3.07 3.41l-.07.17zM104.3 67.1c.19.4 1.77 1.43.67 1-.34-.2-.71-.6-.67-1zm2.06.97c-.1.76 1.98 1.11.98 1.15-.55-.04-1.1-.58-.98-1.15zm1.87.78c.81.43 1.68 1.31.31.48-.15-.12-.24-.3-.31-.48zm17.85 13.14c.4.55-.02 1.68-.41 1.78a5 5 0 00.41-1.78zm-1.24 2.18c.5.53-.89 1.76-.25.67.09-.22.18-.45.25-.67zm-1.47 1.73c.54.54-.94 1.53-.19.52 0-.19.17-.34.19-.52zm-1.56 1.27c.25.6-.52 1.5-.91 1.38.4-.37.78-.83.91-1.38zm-5.47-5.91c1.43-.6 3-1.72 3.07-3.41.05 1.74-1.54 2.99-2.96 3.69l-.07-.17zm-20.51 8.85c.53.44.07 1.3-.13 1.55l-.19-.11s.16-.23.36-.58c.1-.25 0-.64-.04-.86zm8.75-1.01c-.5.53-.16 1.18.01 2 0 .04-.16.04-.18.08-.3-.47-.46-1.7.17-2.08zm5.48 32.5c-.2-.74-.92-1.2-1.48-1.58.83.03 1.57.7 1.81 1.49l-.17.05zm-6.89-2.68c-1.9.36-3.87.75-5.77.08-1.61-.33 2.07.25 2.74.17 1.02.02 2-.37 3.03-.25zm1.68-37.61c-2.3.95-4.81.17-7.2.5-.65.29-3.73-.83-1.64-.29 2.2.25 4.42-.17 6.62.13.75.01 1.5-.1 2.22-.34zm4.06 41.29c-.01 1.25.19 3.11-1.19 3.93-.4.18-.57.43-.87.47-.23.03.28-.39.46-.5 1.47-.99 1.45-2.41 1.45-3.75-.21-.02.18-.27.15-.15z"/>
       <path d="M108.5 122c-.81.91.22 2.7-1.02 3.33.95-.87-.06-2.64 1.02-3.33zm9.24-27.8c1.92-1.55 4.6-1.64 6.79-.62 2.22.72 4.77.65 6.88-.19-2.73 1.55-6.03.96-8.84-.05-1.63-.54-3.41.08-4.83.86zm4.23.57a5.56 5.56 0 00-3.29 1.71c-.63.19-.87-1.15-.29-.22.95-.68 2.14-1.83 3.57-1.49zM117 97.94c2.8 1.96 6.54 1.95 9.53.44 1.33-.73 3.03-1.94.96-.31-3.07 2.12-7.57 2.45-10.49-.13zm-7.33 28.7c.27-.83.14-1.91-.11-2.66-.68-2.16.8.93.58 1.84-.01.35-.08.82-.28 1.17zm.32.71c.23-.4.37-.86.42-1.29.1.5-.03 1.08-.3 1.53zm-6.24 2.85c-2.52-.3-5.03-.11-7.55.04 2.42-.47 5.07-.56 7.55-.04zm3.8-27.86c-.83 3.13-.28 6.54-1.66 9.57-.38 1.17-1 2.9-.37.47 1.2-3.07.99-6.44 1.8-9.59.1-.12.1-.35.23-.45zm3.51 0c1.11-.27 2.65.65 3.41-.63 1.31-2.06.27 1-1.43 1-.69.01-1.35-.43-1.98-.37zm4.1 3.31c-.4 1.3-.98 2.66-1.52 3.86a7.93 7.93 0 011.52-3.86zm-2.59-8.42c-.11-1.44 3.31-.47 2.09-.43-.71-.11-1.6-.13-2.09.43zm-3.4 4.14c2.33-1.45 2.78-4.27 3.98-6.5 1.2-1.2-.07.09-.17.72-.74 2.23-1.56 4.67-3.81 5.78zm-2.89-7.21c.22.4-.24 1.84-.37 1.58-.05-.56.32-1.03.37-1.58zm.66 1.86c-.4.26-1 1.83-.69.52.15-.25.4-.49.69-.52zm-.32 1.58c-.27 1.11-.8.55-.05.01zm.22.97c.12.78-.5.77-.1.07a.24.24 0 01.1-.07zm.3 1.12c.37.8-.3.76-.07.04l.03-.03zm1.02 15.18c-.29 1.07-.87.5 0 0zm-.11 1.29c.08 1-.52.73-.14.07a.22.22 0 01.14-.07zm.73-3.96c-.31.22-.97 1.45-.7.5.13-.27.42-.5.7-.5zm-.5 1.58c-.58 1-.97.38-.04.01h.04zm.8-15.33c.18-1.12.66-2.61 1.75-3.01-.84.82-1.14 2.04-1.75 3.01zm-19.49 23.07c.22-.76 1.02-1.53 1.81-1.46-.63.35-1.28.82-1.48 1.55 0 .12-.34-.22-.33-.09zm6.61-1.72c1.91.1 3.85.86 5.76.2.8-.29 2.58-.25.86.01-1.9.81-3.99.67-5.87-.07-.24-.09-.54-.06-.75-.14zm-5.09 2.8c.38 1.13.11 2.9 1.36 3.74.73.33 1.64 1.4.2.45-1.58-1.05-1.57-2.76-1.56-4.19z"/>
diff --git a/charges/bullPassant.svg b/charges/bullPassant.svg
index 48b9c9ca..c73a9795 100644
--- a/charges/bullPassant.svg
+++ b/charges/bullPassant.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--source: wappenwiki.org, CC BY-NC-SA 3.0-->
-  <g id="bullPassant" stroke-width="3.3">
+  <g id="bullPassant" stroke-width="2">
     <path d="M255.1 371.8s3.7 2 4.6 5c1.6 6.7-6 18.9-11 24-1.5 1.6-4.4-6.9-5.9-12.6 0 0-.1 3 .4 5.3l.7 3.8s-2.7 3.8-5.3 6.2c-1.6-3.2-.4-7.2-1.7-13.3-1-4.8 4.1-8.3 7.9-11.4 3.8-3.1 10.3-7 10.3-7zm351.1 47.6s1.3 4-.2 6.8c-3.5 5.9-17.4 9.5-24.5 9.7-2.2.1 1.6-8 4.5-13.2 0 0-2.2 2.1-3.4 4.1l-2.1 3.2s-4.6.8-8.1.8c1.1-3.4 4.7-5.5 8-10.7 2.6-4.1 8.7-3.1 13.6-2.7 4.8.3 12.2 2 12.2 2zm-87.7-10.2s1.3 4-.2 6.8c-3.5 5.9-17.4 9.5-24.5 9.7-2.2.1 1.6-8 4.5-13.2 0 0-2.2 2.1-3.4 4.1l-2.1 3.2s-4.6.8-8.1.8c1.1-3.4 4.7-5.5 8-10.7 2.6-4.1 8.7-3.1 13.6-2.7 4.8.3 12.2 2 12.2 2zm-196.6 10.2s1.3 4-.2 6.8c-3.5 5.9-17.4 9.5-24.5 9.7-2.2.1 1.6-8 4.5-13.2 0 0-2.2 2.1-3.4 4.1l-2.1 3.2s-4.6.8-8.1.8c1.1-3.4 4.7-5.5 8-10.7 2.6-4.1 8.7-3.1 13.6-2.7 4.8.3 12.2 2 12.2 2z" transform="matrix(.15094 0 0 .15087 36.54 63.58)"/>
     <path d="M281.2 303.8c-13.6 9.5-43.7 3.9-41.6 11.9.5 2.5 0 7.7 4.6 19.9 3.3 10 5.9 15.2 8 19 1.8 3.2 2.9 2.2 5.1 3.5 2.2 1.3 1.6 3.4 3.4 5.3-3 3-7-.9-8.5.7.1 5.3 6.9 5.9 5.2 10.2-2.9 3.9-16.3 15-20.7 17.4-.7-2.9-.5-5.2.1-7.2.7-2.4 1-6.7-.3-10.3-1.3-3.5-4.1-7.2-4.4-11.7-.6-7.7-2.6-17-4-22.1-1.9-5.9-6.9-13.8-11.1-21.3-3.5-5.2-1-7.2-1-11.5s-2.6-7.6 2.4-11.5a94 94 0 0118.7-11.7c1.6-1.6 27-22 32.7-25m-47.6-143.9c4.4-9.9-3.3-14.1-3.3-14.1 1 .2-9.8-2.8-9.2-12.4.8-14.3 16.7-16.7 19-32.6.8-9-5.6-13.8-6.4-14-2-.4.9 4.7.1 8.8-3.6 16.5-29 17.8-33 39.8-4.7 21.9 20.7 31.7 18.6 31.3 0 0 9.8 3.1 14.2-6.8z" transform="matrix(.15094 0 0 .15087 36.54 63.58)"/>
     <path d="M203.7 128.7c-.5 1.1-11.1 1.1-18.7-2.7-5.4-2.8-6.3-5.2-6.7-6.1-1.8-.9-4.8-5.8-4.6-7.7-5.2-7.6-5-16.8-3.8-19.6.3-.4 2.2-.5 2.8 0 1 1.7 1.7 5.2 5.8 7.2 6.8 3.4 14.2.9 22.3 5a41.7 41.7 0 0110.1 9.9m289 161.3c1.1 3.8 2.8 8.3 5 12.9 5.4 11.1 15.3 15.3 17.2 29.7 3 15.2 1.1 33.4-4.9 49.7-1.9 4.7-3.9 15-7.2 22.7-2.1 5.1-5.4 8.5-7.1 10.5-1.9 2.3-4.2 2.9-6.3 4.1a13 13 0 00-5.1 5.1c4.8 1.3 22.2 2.5 27 1.8 4.1-2 1.3-10.9 3.3-11 2.2-.1 2.4 5.5 6.6 5.4 0-2.6 1.1-6.1 1-8.3-.2-7-3-5.8 3.6-24.1 10-27.1 16.7-33.7 20.2-40.6 2.2-4.3.4-14-.1-20.1 2.8-7.7-.4-27.4 3.7-38.5" transform="matrix(.15094 0 0 .15087 36.54 63.58)"/>
diff --git a/charges/cancer.svg b/charges/cancer.svg
index 937ea3eb..49a2c83b 100644
--- a/charges/cancer.svg
+++ b/charges/cancer.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--source: wappenwiki.org, CC BY-NC-SA 3.0-->
-  <g id="cancer" stroke-width=".5">
+  <g id="cancer" stroke-width=".3">
     <path d="M105.3 65.7c-.3 0-1.3 1.4-1.4 4.1-.1 2.2.8 5.9.8 5.9s1.8 6.3 2.6 7.1c.8 1 5-3.2 4.6-4.7-.4-1.5-2.2-1.7-2.9-2.8-.4-.3-.2-1-.3-1.1-.1-.2-.7 0-1-.3-.2-.4-.6-.4-.7-1 0-.6.8-.7.5-1.4-.3-.6-1.5-1-1.7-1.5 0-.6.5-1.2.4-1.5 0-.3-.8-.6-.8-1.2s.4-1 .2-1.4c-.1-.4 0-.2-.3-.2zm-10.5 0c.2 0 1.2 1.4 1.3 4.1.1 2.2-.8 5.9-.8 5.9s-1.8 6.3-2.6 7.1c-.8 1-5-3.2-4.6-4.7.4-1.5 2.2-1.7 3-2.8.3-.3.1-1 .2-1.1.1-.2.8 0 1-.3.2-.4.7-.4.7-1 .1-.6-.8-.7-.5-1.4s1.5-1 1.7-1.5c.1-.6-.5-1.2-.4-1.5 0-.3.9-.6.9-1.2s-.4-1-.3-1.4c.1-.4.1-.2.4-.2zm26.4 22.2s1-1.4 1.7-3.8l.6-2.9c0-1.4-.2-2.5 0-2.6.3 0 .6.9.8 2 .2 1.1.2 2.5.2 2.5s.7-.6 1.3-1.5c.4-.6.6-1.6.7-1.6.2.2 0 2.3-1 4.6a22.3 22.3 0 01-3.3 4.8l-1-1.5zm2.2 6.5s1.2-.8 2.3-2.6c.4-.6 1-1.4 1.2-2 .5-1.2.6-2.1.8-2 .2 0 .2.8 0 1.7 0 1-.5 2-.5 2s.8-.3 1.5-.8c.5-.4.9-1.1 1-1 .1.1-.6 1.7-2 3.3-1.6 1.6-4 3-4 3l-.3-1.6z"/>
     <path d="M106.9 62.7c1-.2 2.5 0 4 1.3 1.6 1.4 3.3 4 4.4 7.5.3.7 1 2.7 1.6 5.2 1.1 4.3.9 7.6 0 9.2-.5 1-2 2.3-3.4 2.7-1.4.4-1.9-.3-2.2-.3-1.3.4-2.5-1.7-3.4-3.5-.7-1.2-1.5-1.9-1.6-2.4-.2-.7.5-.1 1.8-1 .7-.4.1-.9.9-1.6.8-.7 1-.1.9-1-.8-2.4.3-2.7 0-3.6-.1-1-.8-1.4-.9-1.8-.1-.7.3-.6.1-1.6 0-.4-.3-.8-.4-1.2-.1-.8.5-1.4.4-1.7s-1.2-.6-1.3-1c-.1-.5.6-1.2.3-2.3-.2-.8-.6-1.3-.9-1-.5-.3-.3-.6-.6-.8-.6-.6-1 0-1-.2-.2 0 0-.6 1.3-.9zm18.9 39.1l.8-.7 2.3-1.7c1-.7 3-.4 2.9-.4-.1-.5-2-1.2-3.8-.4-1.7.8-3.4 2.5-3.4 2.5l1.2.7zm-1.3 5.6l.8-.6s1.8-1.2 2.6-2.1c.8-1 2.8-1.3 2.8-1.3-.3-.4-2.3-.3-3.8.9a26.6 26.6 0 01-3.6 2.4l1.2.7zm-21.7-22.9c.1-1.4-.8-5.7-.6-11.4.3-6.2 1.9-12 1.7-12.2a48 48 0 00-2.4 12.1c-.6 5.6 0 10.3 0 11.3s1.2 1.6 1.3.2zm-24 3.4s-1-1.4-1.7-3.8l-.6-2.9c0-1.4.2-2.5 0-2.6-.3 0-.6.9-.8 2-.2 1.1-.2 2.5-.2 2.5s-.7-.6-1.3-1.5c-.4-.6-.6-1.6-.7-1.6-.2.2 0 2.3 1 4.6 1.1 2.4 3.3 4.8 3.3 4.8l1-1.5zm-2.2 6.5s-1.2-.8-2.3-2.6c-.4-.6-1-1.4-1.2-2-.5-1.2-.6-2.1-.8-2-.2 0-.2.8 0 1.7 0 1 .5 2 .5 2s-.8-.3-1.5-.8c-.5-.4-.9-1.1-1-1-.1.1.6 1.7 2 3.3 1.6 1.6 4 3 4 3l.3-1.6zm16.5-31.7c-1-.2-2.5 0-4 1.3-1.6 1.4-3.3 4-4.4 7.5-.3.7-1 2.7-1.6 5.2-1.1 4.3-.9 7.6 0 9.2.5 1 2 2.3 3.4 2.7s1.9-.3 2.2-.3c1.3.4 2.5-1.7 3.4-3.5.7-1.2 1.5-1.9 1.6-2.4.2-.7-.5-.1-1.8-1-.7-.4-.1-.9-.9-1.6-.8-.7-1-.1-.9-1 .8-2.4-.3-2.7 0-3.6.1-1 .8-1.4.9-1.8.1-.7-.3-.6-.1-1.6 0-.4.3-.8.4-1.2.1-.8-.5-1.4-.4-1.7 0-.2 1.2-.6 1.3-1 .1-.5-.6-1.2-.3-2.3.2-.8.6-1.3.9-1 .5-.3.3-.6.6-.8.6-.6 1 0 1-.2.2 0 0-.6-1.3-.9zm-18.9 39.1l-.8-.7-2.3-1.7c-1-.7-3-.4-2.9-.4.1-.5 2-1.2 3.8-.4 1.7.8 3.4 2.5 3.4 2.5l-1.2.7zm1.3 5.6l-.8-.6s-1.8-1.2-2.6-2.1c-.8-1-2.8-1.3-2.8-1.3.3-.4 2.3-.3 3.8.9 1.4 1.2 3.6 2.4 3.6 2.4l-1.2.7zm21.7-22.9c-.1-1.4.8-5.7.6-11.4-.3-6.2-1.9-12-1.7-12.2.4-.2 1.8 6 2.4 12.1.5 5.6 0 10.3 0 11.3s-1.2 1.6-1.3.2zm-.7 45.5s-1.4.5-2.6 1.4c-1.3 1-2.3 2.1-2.6 2.5-.3.4-.4 1 .4 2.1.9 1.1 2.8 2.2 4 2.2 1 0 2-1.3 2-1.3v-4.6l-1.2-2.3zm7.1 0s1.4.5 2.6 1.4c1.4 1 2.3 2.1 2.6 2.5.3.4.4 1-.4 2.1-.9 1.1-2.8 2.2-3.9 2.2s-2-1.3-2-1.3v-4.6l1.1-2.3z"/>
     <path d="M102.2 128.7s1.1 2.4 1.1 6c0 2-.4 3.2-.7 3.6-.3.4-1.4 1-2.6 1-1.1 0-2.2-.6-2.5-1-.3-.4-.7-1.6-.7-3.7 0-3.5 1.1-5.9 1.1-5.9h4.3zm-7.4-.5c-1 0-.6.2-1.6.2s-2.2-1-3.3-1c-1 0-2.2.9-2.2 2.8s1.5 4.3 3 4.3 5.1-4.6 5.1-4.6 0-1.7-1-1.7zm10.5 0c1 0 .6.2 1.6.2s2.2-1 3.3-1c1 0 2.2.9 2.2 2.8s-1.5 4.3-3 4.3-5-4.6-5-4.6 0-1.7 1-1.7z"/>
diff --git a/charges/сarreau.svg b/charges/carreau.svg
similarity index 100%
rename from charges/сarreau.svg
rename to charges/carreau.svg
diff --git a/charges/cock.svg b/charges/cock.svg
index d8f92c52..cfd58106 100644
--- a/charges/cock.svg
+++ b/charges/cock.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--source: wappenwiki.org, CC BY-NC-SA 3.0-->
-  <g id="cock" stroke-width=".6">
+  <g id="cock" stroke-width=".4">
     <path d="M116 112.6c1.3.8 2.1 2.2 2.4 3.7.2 1.5-.1 3-.5 4.5 1.2-.1 2.3-1 3-2.2.5-1.1.6-2.5.4-3.7-.2-1.3-.7-2.5-1.2-3.7"/>
     <path d="M121.2 110a9 9 0 013.2 3.1c.8 1.3 1.1 3 .7 4.4-.3 1-1 2-2 2.7.3-1.6.1-3.4-.8-4.8-.4-.7-1-1.1-1.4-1.8-.5-.7-.7-1.7-1.2-2.4"/>
     <path d="M121.6 109a8 8 0 013.4 1c1 .8 1.9 1.8 2.1 3 .2 1 0 2-.5 2.7a5 5 0 00-2.2-3.2c-.6-.4-1.2-.4-1.7-.7l-1.7-1.4m-39.5 13.9s-.4-1-1.3-.8c-.9.3-.8.9-.8.9v.6c0 .9-.6 1-1.2 1l-.4-.1c-.2 0 .5 1.2 2.1.8 1.8-.5 1.6-2.4 1.6-2.4zm-9.7-4s1 .5.7 1.4c-.4.8-1 .7-1 .7H71c-.8 0-1 .5-1 1.1l.1.5c0 .2-1.2-.6-.7-2.2.5-1.8 2.5-1.5 2.5-1.5zm-.8-4.9s.9.8.2 1.5-1.1.4-1.1.4l-.6-.3c-.8-.3-1.2.1-1.3.7l-.1.4c-.1.2-.9-1 .2-2.3 1-1.4 2.7-.4 2.7-.4zm3.7-2.7s0 1.2-1 1.2c-.8 0-1-.4-1-.4l-.1-.6c-.4-.8-1.1-.8-1.6-.5-.2.1-.2.3-.4.3s0-1.3 1.8-1.6c1.8-.3 2.3 1.6 2.3 1.6z"/>
diff --git a/charges/compassRose.svg b/charges/compassRose.svg
index 16e3ba6b..8a6a8139 100644
--- a/charges/compassRose.svg
+++ b/charges/compassRose.svg
@@ -2,6 +2,6 @@
 <!--Author: Azgaar. License: Public Domain-->
   <g id="compassRose" stroke-width=".5">
     <path d="M100 60l6 28 14-8-8 15 28 5-28 6 8 14-14-8-6 28-6-28-14 8 8-14-28-6 28-6-8-14 14 8z"/>
-    <path fill="#000" d="M100 61v39l7-6 5 1c2.7-5 5.3-10 8-15-4.3 4.3-8.7 9.7-13 14-2.3-10.7-4.7-22.3-7-33zm0 39l7 7c10.7-2.3 21.3-4.7 32-7zm0 0l-7 7c2.3 10.7 4.7 21.3 7 32zm0 0l-7-7-32 7zm-7-7l1-5-14-8zm0 14c-1.7-.3-3.3-.7-5-1-2.7 4.7-5.3 9.3-8 14l13-13zm14 0c-.3 1.7-.7 3.3-1 5 4.7 2.7 9.3 5.3 14 8z" opacity=".5"/>
+    <path fill="#000" stroke="#000" fill-opacity=".5" stroke-opacity=".2" d="M100 61v39l7-6 5 1c2.7-5 5.3-10 8-15-4.3 4.3-8.7 9.7-13 14-2.3-10.7-4.7-22.3-7-33zm0 39l7 7c10.7-2.3 21.3-4.7 32-7zm0 0l-7 7c2.3 10.7 4.7 21.3 7 32zm0 0l-7-7-32 7zm-7-7l1-5-14-8zm0 14c-1.7-.3-3.3-.7-5-1-2.7 4.7-5.3 9.3-8 14l13-13zm14 0c-.3 1.7-.7 3.3-1 5 4.7 2.7 9.3 5.3 14 8z"/>
   </g>
 </svg>
diff --git a/charges/crown.svg b/charges/crown.svg
index 1b06f811..3a7629c8 100644
--- a/charges/crown.svg
+++ b/charges/crown.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--source: wappenwiki.org, CC BY-NC-SA 3.0-->
-  <g id="crown" stroke-width=".86">
+  <g id="crown" stroke-width=".6">
     <path d="M98.2 84c4.3 0 6.5-6.9 9.6-6.9 4.3 0 3.4 6.6 3.4 8.3 0 1.7 1 8.3-3.4 8.3-3.1 0-5.3-7-9.6-7"/>
     <path d="M101.8 84c-4.3 0-6.4-6.9-9.6-6.9-4.3 0-3.5 6.6-3.5 8.3 0 1.7-.8 8.3 3.5 8.3 3.1 0 5.3-7 9.6-7m33.5 4.9c1-6.2-3.5-11-2.7-15.5 1-6.2 5.6-3.5 6.9-3.1-1.5 8.7-2.6 18-2.6 18"/>
     <path d="M138.5 90.3c-4.3-1.4-5.2-8.8-8.3-9.9-4.2-1.3-4.4 5.2-4.8 7-.3 1.6-2.1 7.9 2 9.3 3.1 1 6.4-5.1 10.5-3.7M99 86.4c0-6.5-5.2-9.6-5.2-14.3 0-6.4 5-5.3 6.3-5.3s6.2-1.1 6.2 5.3c0 4.6-5.2 7.8-5.2 14.3m-36.4 5.2c-1-6.2 3.5-11 2.7-15.5-1-6.2-5.6-3.5-7-3.1a474 474 0 012.7 18"/>
diff --git a/charges/escallop.svg b/charges/escallop.svg
index 14652210..6d912bfd 100644
--- a/charges/escallop.svg
+++ b/charges/escallop.svg
@@ -1,7 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
   <g id="escallop" stroke-width=".375">
-    <path stroke-width=".675" d="M106.64 78.61s4.36.63 6.82-2.32c2.45-2.49 1.39-3 3.37-4.27 1.96-1.26 3.89-1.8 3.89-3.8 0-1.69-1.48-1.62-1.66-1.62-2.43 0-1.78.72-9.68 1.9-2.47.12-2.52.05-3.9 0m-10.9.05c-1.37.02-1.44.1-3.92-.02-7.9-1.17-7.24-1.89-9.67-1.89-.18 0-1.67-.25-1.67 1.46 0 1.98 1.9 2.7 3.89 3.94 1.98 1.26.93 1.75 3.38 4.28 2.45 2.94 6.82 2.3 6.82 2.3"/>
-    <path stroke-width=".675" d="M101.19 136.93c.95.76 2.03 1.98 4.12 1.84 2.77-.72 2.1-2.1 3.55-2.65 2.01-.8 4.32.16 6.75-1.6 1.4-1.01 1.22-2.18.8-3.17.15-.83.9-1.03 1.8-.99 1.34.07 2.89.72 4.1-.07 2.89-1.84.14-2.27 2.42-3.96 1.46-.94 2.85-.06 4.14-1.48 1.23-1.13.24-3.33-.75-3.85-.45-1.96.97-1.7 1.38-1.75.74-.12 2.58.45 3.7-.79 1.29-1.5-.51-3.06.05-3.8.54-.77 2.55-1.3 2.34-3.2-.22-1.9-1.2-2.43-1.95-2.52-.97-1.75.1-1.51.47-1.7.67-.3 2.8-.98 3.53-2.46.86-1.8-1.12-3.22-.76-4.07.3-.9 2.09-1.92 1.35-3.72-.72-1.8-1.78-1.66-2.88-1.82-1.04.02-2.12-1.12-.9-1.71 5.1-2.65 1-5.49.47-7.3 2.65-2.87.27-4.35-.52-5.3-.8-.94-8.91 8.66-17.62 8.57-8.86 0-9.13-11.13-9.9-16.17-.36-2.16-.76-4.95-1.48-7.52-.99-3.5-2.57-4.9-5.36-4.9-2.81 0-4.38 1.4-5.37 4.9-.72 2.57-1.13 5.38-1.46 7.52-.79 5.04-1.04 16.17-9.93 16.17-8.7.09-16.83-9.5-17.6-8.57-.8.95-3.2 2.45-.55 5.3-.5 1.83-4.62 4.65.49 7.3 1.24.6.14 1.71-.9 1.71-1.1.16-2.14.05-2.88 1.82-.72 1.8 1.06 2.84 1.35 3.72.34.85-1.62 2.29-.76 4.07.72 1.48 2.85 2.16 3.53 2.47.36.18 1.44-.1.47 1.69-.76.09-1.71.6-1.93 2.52-.21 1.9 1.77 2.43 2.3 3.2.58.72-1.22 2.3.08 3.78 1.1 1.23 2.95.69 3.69.81.41.06 1.82-.21 1.37 1.75-1 .52-2 2.75-.74 3.85 1.28 1.39 2.66.52 4.14 1.48 2.3 1.67-.45 2.12 2.45 3.96 1.2.77 2.75.14 4.08.07.9-.04 1.68.16 1.8.99-.41.99-.6 2.16.81 3.17 2.43 1.74 4.77.8 6.75 1.6 1.44.56.78 1.89 3.55 2.66 2.09.15 3.17-1.08 4.12-1.85.36-.3 1.91-.3 2.29 0z"/>
+    <path stroke-width=".5" d="M106.64 78.61s4.36.63 6.82-2.32c2.45-2.49 1.39-3 3.37-4.27 1.96-1.26 3.89-1.8 3.89-3.8 0-1.69-1.48-1.62-1.66-1.62-2.43 0-1.78.72-9.68 1.9-2.47.12-2.52.05-3.9 0m-10.9.05c-1.37.02-1.44.1-3.92-.02-7.9-1.17-7.24-1.89-9.67-1.89-.18 0-1.67-.25-1.67 1.46 0 1.98 1.9 2.7 3.89 3.94 1.98 1.26.93 1.75 3.38 4.28 2.45 2.94 6.82 2.3 6.82 2.3"/>
+    <path stroke-width=".5" d="M101.19 136.93c.95.76 2.03 1.98 4.12 1.84 2.77-.72 2.1-2.1 3.55-2.65 2.01-.8 4.32.16 6.75-1.6 1.4-1.01 1.22-2.18.8-3.17.15-.83.9-1.03 1.8-.99 1.34.07 2.89.72 4.1-.07 2.89-1.84.14-2.27 2.42-3.96 1.46-.94 2.85-.06 4.14-1.48 1.23-1.13.24-3.33-.75-3.85-.45-1.96.97-1.7 1.38-1.75.74-.12 2.58.45 3.7-.79 1.29-1.5-.51-3.06.05-3.8.54-.77 2.55-1.3 2.34-3.2-.22-1.9-1.2-2.43-1.95-2.52-.97-1.75.1-1.51.47-1.7.67-.3 2.8-.98 3.53-2.46.86-1.8-1.12-3.22-.76-4.07.3-.9 2.09-1.92 1.35-3.72-.72-1.8-1.78-1.66-2.88-1.82-1.04.02-2.12-1.12-.9-1.71 5.1-2.65 1-5.49.47-7.3 2.65-2.87.27-4.35-.52-5.3-.8-.94-8.91 8.66-17.62 8.57-8.86 0-9.13-11.13-9.9-16.17-.36-2.16-.76-4.95-1.48-7.52-.99-3.5-2.57-4.9-5.36-4.9-2.81 0-4.38 1.4-5.37 4.9-.72 2.57-1.13 5.38-1.46 7.52-.79 5.04-1.04 16.17-9.93 16.17-8.7.09-16.83-9.5-17.6-8.57-.8.95-3.2 2.45-.55 5.3-.5 1.83-4.62 4.65.49 7.3 1.24.6.14 1.71-.9 1.71-1.1.16-2.14.05-2.88 1.82-.72 1.8 1.06 2.84 1.35 3.72.34.85-1.62 2.29-.76 4.07.72 1.48 2.85 2.16 3.53 2.47.36.18 1.44-.1.47 1.69-.76.09-1.71.6-1.93 2.52-.21 1.9 1.77 2.43 2.3 3.2.58.72-1.22 2.3.08 3.78 1.1 1.23 2.95.69 3.69.81.41.06 1.82-.21 1.37 1.75-1 .52-2 2.75-.74 3.85 1.28 1.39 2.66.52 4.14 1.48 2.3 1.67-.45 2.12 2.45 3.96 1.2.77 2.75.14 4.08.07.9-.04 1.68.16 1.8.99-.41.99-.6 2.16.81 3.17 2.43 1.74 4.77.8 6.75 1.6 1.44.56.78 1.89 3.55 2.66 2.09.15 3.17-1.08 4.12-1.85.36-.3 1.91-.3 2.29 0z"/>
     <g fill="#000" stroke="none">
       <path d="M73.56 123.08a52.6 52.6 0 01-5.23 12.62c.74-.28 1.12-1.97 1.67-2.7a47.64 47.64 0 003.56-9.92zm-14.7.33c3.16-.6 6.05-2.41 8.18-4.76-2.27 2.18-5.06 3.92-8.18 4.54v.22zm37.08 3.68c-.1-.44-.47-.76-.84-.98-.11.4.9.3 1.15.07-.41.13-.95-.12-1.34-.02.3.33.76.55 1.03.93zm2.2-7.59c-.19-.39-.88-.4-.4-.64 1.11-.87-1.06.1-.08.41.15.1.32.14.48.23zm-7.51 14.21c.2-1.05-.33-1.17.78-.93.67-.08-.4-.16-.61-.25-.5-.23-.12 1.04-.17 1.18zm-8.67 4.95c.34-.41.53-.93.56-1.46-.46.18.45.97.88.95-.44-.2-.75-.61-.94-1.03-.25.35-.23 1.07-.5 1.52zm15.2-27.37c-.18-.26-1.39-.74-.96-.4.34.14 1.25-.94.61-.45-.28.25-1.35.23-.54.55.3.08.62.24.89.3zm-.56 3.34c-2.26.69-4.7.5-7 .48 2.27.3 4.63.35 6.87-.2.2-.07.23-.05.13-.28zm-.4 8.59c-3.12-.6-5.91-2.4-8.18-4.52a15.1 15.1 0 008.17 4.75l.01-.23zm-2.3 5.72c-3.2-.93-5.55-3.52-7.64-5.99-.15-.1-1.8-2.38-.9-1.02 2.13 2.84 4.58 5.83 8.02 7.06.29-.07.52.37.52-.05zm-6.25 6.16c-1.63-.87-2.28-2.82-3.1-4.37a69.75 69.75 0 01-2.96-7.71c1.04 3.81 2.4 7.6 4.53 10.95.27.28 1.2 1.68 1.53 1.13zm-9.39 3.71c-.52-3.91-.43-7.89-.56-11.83-.03-1.02-.02-2.1-.11-3.08-.03 4.65.04 9.3.31 13.94.17.18-.11 1.28.36.97zM59.1 127.09c.2-.45.8-.6 1-.98-.31.02-1.23.04-1.26.08.28.28 1.51.02.95-.04-.31.22-.68.53-.69.94zm-2.2-7.59c.41-.08 1.13-.52.45-.82-.83-.67.1.53.15.28-.2.18-.43.34-.6.54zm7.51 14.21c.05-.44.3-1.5-.41-1.12-.85.07-.56.27.15.15.56-.46-.05.49.26.97zm8.67 4.95c-.25-.47-.33-1.02-.44-1.5-.3.27-.51.83-1 1.01.43-.02.98-.43 1.07-.92-.41 0 0 .75.1 1.04.07.14.14.27.27.37zm-15.2-27.36c.25-.14 1.58-.38 1-.6-.31.13-1.25-.74-.78-.16.19.51 1.33.23.53.3-.25.13-.58.21-.75.46zm7.56 4c-2.41.3-4.85.32-7.28.22.75.5 2.33.18 3.46.2 1.28-.05 2.57-.11 3.82-.42z" transform="matrix(1.8 0 0 1.8 -39.5 -113)"/>
       <path d="M66.94 118.5c-1.81 1.5-3.8 2.86-6.1 3.48-.73.2-1.49.31-2.25.32.06.45.88.05 1.22.1 2.66-.41 5.04-1.9 6.97-3.72l.16-.18zm3.25 2.99a35.21 35.21 0 01-8.35 8.46c.32.3.76-.47 1.11-.6 2.6-2 4.92-4.37 6.75-7.1.18-.24.31-.52.49-.76z" transform="matrix(1.8 0 0 1.8 -39.5 -113)"/>
diff --git a/charges/lozengeFaceted.svg b/charges/lozengeFaceted.svg
index 81bec3dc..23462185 100644
--- a/charges/lozengeFaceted.svg
+++ b/charges/lozengeFaceted.svg
@@ -2,9 +2,9 @@
 <!--Author: Azgaar. License: Public Domain-->
   <g id="lozengeFaceted">
     <polygon points="100 55 130 100 100 145 70 100"/>
-    <g fill="#000">
-      <polygon points="100 99 130 99 100 55" opacity=".2"/>
-      <polygon points="99 100 70 100 99 145" opacity=".2"/>
+    <g fill="#000" stroke="none">
+      <polygon points="100 100 130 100 100 55" opacity=".2"/>
+      <polygon points="100 100 70 100 100 145" opacity=".2"/>
       <polygon points="100 100 130 100 100 145" opacity=".3"/>
     </g>
   </g>
diff --git a/charges/mullet6Pierced.svg b/charges/mullet6Pierced.svg
index 03be315a..a58b68e4 100644
--- a/charges/mullet6Pierced.svg
+++ b/charges/mullet6Pierced.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--Author: Azgaar. License: Public Domain-->
   <g id="mullet6Pierced">
-    <path d="M100 60l7.64 26.77 27-6.77-19.36 20 19.36 20-27-6.77L100 140l-7.64-26.77-27 6.77 19.36-20-19.36-20 27 6.77zm-8 40a8 8 0 1016 0 8 8 0 10-16 0"/>
+    <path d="M100 60l7.64 26.77 27-6.77-19.36 20 19.36 20-27-6.77L100 140l-7.64-26.77-27 6.77 19.36-20-19.36-20 27 6.77z M 108,100 a 8,8 0 0 0 -8,-8 8,8 0 0 0 -8,8 8,8 0 0 0 8,8 8,8 0 0 0 8,-8 z"/>
   </g>
 </svg>
diff --git a/charges/mulletPierced.svg b/charges/mulletPierced.svg
index f1f67375..88f706b9 100644
--- a/charges/mulletPierced.svg
+++ b/charges/mulletPierced.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" fill="#d7374a" stroke="#000" viewBox="50 50 200 200">
 <!--Author: Azgaar. License: Public Domain-->
   <g id="mulletPierced">
-    <path d="M100 60l8.98 27.64h29.06l-23.51 17.08 8.98 27.64L100 115.28l-23.51 17.08 8.98-27.64-23.51-17.08h29.06zm-8 40a8 8 0 1016 0 8 8 0 10-16 0"/>
+    <path d="M100 60l8.98 27.64h29.06l-23.51 17.08 8.98 27.64L100 115.28l-23.51 17.08 8.98-27.64-23.51-17.08h29.06z M 108,100 a 8,8 0 0 0 -8,-8 8,8 0 0 0 -8,8 8,8 0 0 0 8,8 8,8 0 0 0 8,-8 z"/>
   </g>
 </svg>
diff --git a/modules/coa-generator.js b/modules/coa-generator.js
index 1afc64c0..2a8bfda8 100644
--- a/modules/coa-generator.js
+++ b/modules/coa-generator.js
@@ -23,7 +23,7 @@
     conventional: {
       lozenge: 2, fusil: 4, mascle: 4, rustre: 2, lozengeFaceted: 3, lozengePloye: 1, roundel: 4, roundel2: 3, annulet: 4,
       mullet: 5, mulletPierced: 1, mulletFaceted: 1, mullet4: 3, mullet6: 4, mullet6Pierced: 1, mullet6Faceted: 1, mullet7: 1, mullet8: 1, mullet10: 1,
-      estoile: 1, compassRose: 1, billet: 5, delf: 0, triangle: 3, trianglePierced: 1, goutte: 4, heart: 4, pique: 2, сarreau: 1, trefle: 2,
+      estoile: 1, compassRose: 1, billet: 5, delf: 0, triangle: 3, trianglePierced: 1, goutte: 4, heart: 4, pique: 2, carreau: 1, trefle: 2,
       fleurDeLis: 6, sun: 3, sunInSplendour: 1, crescent: 5, fountain: 1
     },
     crosses: {