[cantarell-fonts/respacing] Fit currency symbols into figurespace width



commit 354c9789c68d66c64e339aebc7efb0b2f3a39ec8
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Sep 8 22:48:00 2019 +0100

    Fit currency symbols into figurespace width

 src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif  |  8 +-
 src/Cantarell-Bold.ufo/glyphs/cedi.glif            | 53 ++++++++++---
 src/Cantarell-Bold.ufo/glyphs/cent.glif            |  6 +-
 src/Cantarell-Bold.ufo/glyphs/colonsign.glif       | 69 ++++++++++++-----
 src/Cantarell-Bold.ufo/glyphs/currency.glif        | 88 ++++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/dollar.glif          | 16 ++--
 src/Cantarell-Bold.ufo/glyphs/dong.glif            | 58 ++++++++++++--
 src/Cantarell-Bold.ufo/glyphs/euro.glif            | 68 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/florin.glif          | 68 +++++++++--------
 src/Cantarell-Bold.ufo/glyphs/franc.glif           | 29 +++++--
 src/Cantarell-Bold.ufo/glyphs/guarani.glif         | 58 +++++++++++---
 src/Cantarell-Bold.ufo/glyphs/hryvnia.glif         | 62 +++++++++++++++
 src/Cantarell-Bold.ufo/glyphs/kip.glif             | 38 ++++++----
 src/Cantarell-Bold.ufo/glyphs/lira.glif            | 74 +++++++++---------
 src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif    | 49 ++++++------
 src/Cantarell-Bold.ufo/glyphs/manat.glif           | 52 +++++++------
 src/Cantarell-Bold.ufo/glyphs/naira.glif           | 55 +++++++++-----
 src/Cantarell-Bold.ufo/glyphs/peseta.glif          | 49 +++++++++---
 src/Cantarell-Bold.ufo/glyphs/peso.glif            | 82 ++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/ruble.glif           | 60 ++++++++-------
 src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif    | 68 +++++++++--------
 src/Cantarell-Bold.ufo/glyphs/sterling.glif        | 66 ++++++++--------
 src/Cantarell-Bold.ufo/glyphs/tenge.glif           | 22 ++++++
 src/Cantarell-Bold.ufo/glyphs/tugrik.glif          | 28 +++++++
 src/Cantarell-Bold.ufo/glyphs/won.glif             | 53 ++++++++-----
 src/Cantarell-Bold.ufo/glyphs/yen.glif             | 44 ++++++-----
 src/Cantarell-Bold.ufo/lib.plist                   |  9 +--
 src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif |  8 +-
 src/Cantarell-Light.ufo/glyphs/cedi.glif           | 53 ++++++++++---
 src/Cantarell-Light.ufo/glyphs/cent.glif           |  6 +-
 src/Cantarell-Light.ufo/glyphs/colonsign.glif      | 69 ++++++++++++-----
 src/Cantarell-Light.ufo/glyphs/currency.glif       | 88 ++++++++++++----------
 src/Cantarell-Light.ufo/glyphs/dong.glif           | 58 ++++++++++++--
 src/Cantarell-Light.ufo/glyphs/euro.glif           | 68 ++++++++---------
 src/Cantarell-Light.ufo/glyphs/florin.glif         | 68 +++++++++--------
 src/Cantarell-Light.ufo/glyphs/franc.glif          | 29 +++++--
 src/Cantarell-Light.ufo/glyphs/guarani.glif        | 58 +++++++++++---
 src/Cantarell-Light.ufo/glyphs/hryvnia.glif        | 64 +++++++++++++++-
 src/Cantarell-Light.ufo/glyphs/kip.glif            | 38 ++++++----
 src/Cantarell-Light.ufo/glyphs/lira.glif           | 74 +++++++++---------
 src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif   | 47 ++++++------
 src/Cantarell-Light.ufo/glyphs/manat.glif          | 52 +++++++------
 src/Cantarell-Light.ufo/glyphs/naira.glif          | 55 +++++++++-----
 src/Cantarell-Light.ufo/glyphs/peseta.glif         | 47 +++++++++---
 src/Cantarell-Light.ufo/glyphs/peso.glif           | 82 ++++++++++----------
 src/Cantarell-Light.ufo/glyphs/ruble.glif          | 60 ++++++++-------
 src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif   | 68 +++++++++--------
 src/Cantarell-Light.ufo/glyphs/sterling.glif       | 66 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/tenge.glif          | 24 +++++-
 src/Cantarell-Light.ufo/glyphs/tugrik.glif         | 30 +++++++-
 src/Cantarell-Light.ufo/glyphs/won.glif            | 53 ++++++++-----
 src/Cantarell-Light.ufo/glyphs/yen.glif            | 40 +++++-----
 src/Cantarell-Light.ufo/lib.plist                  |  9 +--
 .../glyphs/_currencyvstem.glif                     |  8 +-
 src/Cantarell-Regular.ufo/glyphs/cedi.glif         | 53 ++++++++++---
 src/Cantarell-Regular.ufo/glyphs/cent.glif         |  6 +-
 src/Cantarell-Regular.ufo/glyphs/colonsign.glif    | 69 ++++++++++++-----
 src/Cantarell-Regular.ufo/glyphs/currency.glif     | 88 ++++++++++++----------
 src/Cantarell-Regular.ufo/glyphs/dong.glif         | 58 ++++++++++++--
 src/Cantarell-Regular.ufo/glyphs/euro.glif         | 66 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/florin.glif       | 68 +++++++++--------
 src/Cantarell-Regular.ufo/glyphs/franc.glif        | 29 +++++--
 src/Cantarell-Regular.ufo/glyphs/guarani.glif      | 58 +++++++++++---
 src/Cantarell-Regular.ufo/glyphs/hryvnia.glif      | 64 +++++++++++++++-
 src/Cantarell-Regular.ufo/glyphs/kip.glif          | 36 +++++----
 src/Cantarell-Regular.ufo/glyphs/lira.glif         | 74 +++++++++---------
 src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif | 49 ++++++------
 src/Cantarell-Regular.ufo/glyphs/manat.glif        | 52 +++++++------
 src/Cantarell-Regular.ufo/glyphs/naira.glif        | 55 +++++++++-----
 src/Cantarell-Regular.ufo/glyphs/peseta.glif       | 49 +++++++++---
 src/Cantarell-Regular.ufo/glyphs/peso.glif         | 82 ++++++++++----------
 src/Cantarell-Regular.ufo/glyphs/ruble.glif        | 60 ++++++++-------
 src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif | 68 +++++++++--------
 src/Cantarell-Regular.ufo/glyphs/sterling.glif     | 66 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/tenge.glif        | 24 +++++-
 src/Cantarell-Regular.ufo/glyphs/tugrik.glif       | 30 +++++++-
 src/Cantarell-Regular.ufo/glyphs/won.glif          | 53 ++++++++-----
 src/Cantarell-Regular.ufo/glyphs/yen.glif          | 44 ++++++-----
 src/Cantarell-Regular.ufo/lib.plist                |  9 +--
 79 files changed, 2579 insertions(+), 1385 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
index e990aaab..153661c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="370"/>
   <outline>
     <contour>
-      <point x="102" y="649" type="line"/>
-      <point x="268" y="649" type="line"/>
-      <point x="268" y="842" type="line"/>
-      <point x="102" y="842" type="line"/>
+      <point x="102" y="661" type="line"/>
+      <point x="268" y="661" type="line"/>
+      <point x="268" y="831" type="line"/>
+      <point x="102" y="831" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cedi.glif b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
index 116ebfdf..c10e2e4a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="643"/>
+  <advance width="600"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="8"/>
-    <component base="_currencyvstem" xOffset="194" yOffset="-6"/>
-    <component base="_currencyvstem" xOffset="194" yOffset="-800"/>
+    <contour>
+      <point x="362" y="-10" type="curve" smooth="yes"/>
+      <point x="429" y="-10"/>
+      <point x="506" y="10"/>
+      <point x="550" y="39" type="curve"/>
+      <point x="512" y="164" type="line"/>
+      <point x="480" y="150"/>
+      <point x="439" y="142"/>
+      <point x="405" y="142" type="curve" smooth="yes"/>
+      <point x="291" y="142"/>
+      <point x="229" y="224"/>
+      <point x="229" y="359" type="curve" smooth="yes"/>
+      <point x="229" y="485"/>
+      <point x="282" y="551"/>
+      <point x="381" y="551" type="curve" smooth="yes"/>
+      <point x="427" y="551"/>
+      <point x="482" y="541"/>
+      <point x="511" y="525" type="curve"/>
+      <point x="559" y="661" type="line"/>
+      <point x="498" y="690"/>
+      <point x="443" y="704"/>
+      <point x="383" y="704" type="curve" smooth="yes"/>
+      <point x="187" y="704"/>
+      <point x="49" y="560"/>
+      <point x="49" y="342" type="curve" smooth="yes"/>
+      <point x="49" y="131"/>
+      <point x="178" y="-10"/>
+    </contour>
+    <contour>
+      <point x="273" y="655" type="line"/>
+      <point x="430" y="655" type="line"/>
+      <point x="430" y="821" type="line"/>
+      <point x="273" y="821" type="line"/>
+    </contour>
+    <contour>
+      <point x="274" y="-123" type="line"/>
+      <point x="431" y="-123" type="line"/>
+      <point x="431" y="31" type="line"/>
+      <point x="274" y="31" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cent.glif b/src/Cantarell-Bold.ufo/glyphs/cent.glif
index e6cf785f..dd08eef9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cent.glif
@@ -3,9 +3,9 @@
   <advance width="600"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="16"/>
-    <component base="_currencyvstem" xOffset="95" yOffset="-202"/>
-    <component base="_currencyvstem" xOffset="100" yOffset="-781"/>
+    <component base="c" xOffset="68"/>
+    <component base="_currencyvstem" xOffset="147" yOffset="-202"/>
+    <component base="_currencyvstem" xOffset="152" yOffset="-781"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
index 5f12ba63..e8e2fc34 100644
--- a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="646"/>
+  <advance width="600"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="414" y="625" type="line"/>
-      <point x="534" y="625" type="line"/>
-      <point x="577" y="837" type="line"/>
-      <point x="457" y="837" type="line"/>
+      <point x="372" y="625" type="line"/>
+      <point x="491" y="625" type="line"/>
+      <point x="529" y="821" type="line"/>
+      <point x="410" y="821" type="line"/>
     </contour>
     <contour>
-      <point x="148" y="-141" type="line"/>
-      <point x="268" y="-141" type="line"/>
-      <point x="305" y="80" type="line"/>
-      <point x="185" y="80" type="line"/>
+      <point x="130" y="-123" type="line"/>
+      <point x="249" y="-123" type="line"/>
+      <point x="284" y="80" type="line"/>
+      <point x="164" y="80" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="625" type="line"/>
-      <point x="357" y="625" type="line"/>
-      <point x="400" y="837" type="line"/>
-      <point x="280" y="837" type="line"/>
+      <point x="204" y="625" type="line"/>
+      <point x="323" y="625" type="line"/>
+      <point x="361" y="821" type="line"/>
+      <point x="241" y="821" type="line"/>
     </contour>
     <contour>
-      <point x="326" y="-141" type="line"/>
-      <point x="446" y="-141" type="line"/>
-      <point x="483" y="80" type="line"/>
-      <point x="363" y="80" type="line"/>
+      <point x="299" y="-123" type="line"/>
+      <point x="418" y="-123" type="line"/>
+      <point x="453" y="80" type="line"/>
+      <point x="333" y="80" type="line"/>
+    </contour>
+    <contour>
+      <point x="359" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="503" y="10"/>
+      <point x="547" y="39" type="curve"/>
+      <point x="509" y="164" type="line"/>
+      <point x="477" y="150"/>
+      <point x="436" y="142"/>
+      <point x="401" y="142" type="curve" smooth="yes"/>
+      <point x="288" y="142"/>
+      <point x="226" y="224"/>
+      <point x="226" y="359" type="curve" smooth="yes"/>
+      <point x="226" y="486"/>
+      <point x="280" y="551"/>
+      <point x="378" y="551" type="curve" smooth="yes"/>
+      <point x="424" y="551"/>
+      <point x="479" y="541"/>
+      <point x="508" y="525" type="curve"/>
+      <point x="556" y="661" type="line"/>
+      <point x="495" y="690"/>
+      <point x="440" y="704"/>
+      <point x="379" y="704" type="curve" smooth="yes"/>
+      <point x="185" y="704"/>
+      <point x="46" y="560"/>
+      <point x="46" y="342" type="curve" smooth="yes"/>
+      <point x="46" y="131"/>
+      <point x="175" y="-10"/>
     </contour>
-    <component base="C" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/currency.glif b/src/Cantarell-Bold.ufo/glyphs/currency.glif
index f0550bac..732d4454 100644
--- a/src/Cantarell-Bold.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="703"/>
+  <advance width="600"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="345" y="76" type="curve" smooth="yes"/>
-      <point x="505" y="76"/>
-      <point x="611" y="183"/>
-      <point x="611" y="344" type="curve" smooth="yes"/>
-      <point x="611" y="495"/>
-      <point x="509" y="595"/>
-      <point x="357" y="595" type="curve" smooth="yes"/>
-      <point x="197" y="595"/>
-      <point x="91" y="489"/>
-      <point x="91" y="330" type="curve" smooth="yes"/>
-      <point x="91" y="178"/>
-      <point x="193" y="76"/>
+      <point x="295" y="76" type="curve" smooth="yes"/>
+      <point x="455" y="76"/>
+      <point x="561" y="183"/>
+      <point x="561" y="344" type="curve" smooth="yes"/>
+      <point x="561" y="495"/>
+      <point x="459" y="595"/>
+      <point x="307" y="595" type="curve" smooth="yes"/>
+      <point x="147" y="595"/>
+      <point x="41" y="489"/>
+      <point x="41" y="330" type="curve" smooth="yes"/>
+      <point x="41" y="178"/>
+      <point x="143" y="76"/>
     </contour>
     <contour>
-      <point x="128" y="21" type="line"/>
-      <point x="283" y="174" type="line"/>
-      <point x="195" y="262" type="line"/>
-      <point x="40" y="109" type="line"/>
+      <point x="78" y="21" type="line"/>
+      <point x="233" y="174" type="line"/>
+      <point x="145" y="262" type="line"/>
+      <point x="-10" y="109" type="line"/>
     </contour>
     <contour>
-      <point x="578" y="10" type="line"/>
-      <point x="673" y="106" type="line"/>
-      <point x="510" y="264" type="line"/>
-      <point x="416" y="170" type="line"/>
+      <point x="528" y="10" type="line"/>
+      <point x="623" y="106" type="line"/>
+      <point x="460" y="264" type="line"/>
+      <point x="366" y="170" type="line"/>
     </contour>
     <contour>
-      <point x="354" y="246" type="curve" smooth="yes"/>
-      <point x="299" y="246"/>
-      <point x="263" y="283"/>
-      <point x="263" y="339" type="curve" smooth="yes"/>
-      <point x="263" y="391"/>
-      <point x="297" y="425"/>
-      <point x="348" y="425" type="curve" smooth="yes"/>
-      <point x="403" y="425"/>
-      <point x="439" y="388"/>
-      <point x="439" y="333" type="curve" smooth="yes"/>
-      <point x="439" y="281"/>
-      <point x="405" y="246"/>
+      <point x="304" y="246" type="curve" smooth="yes"/>
+      <point x="249" y="246"/>
+      <point x="213" y="283"/>
+      <point x="213" y="339" type="curve" smooth="yes"/>
+      <point x="213" y="391"/>
+      <point x="247" y="425"/>
+      <point x="298" y="425" type="curve" smooth="yes"/>
+      <point x="353" y="425"/>
+      <point x="389" y="388"/>
+      <point x="389" y="333" type="curve" smooth="yes"/>
+      <point x="389" y="281"/>
+      <point x="355" y="246"/>
     </contour>
     <contour>
-      <point x="195" y="398" type="line"/>
-      <point x="293" y="492" type="line"/>
-      <point x="123" y="662" type="line"/>
-      <point x="26" y="566" type="line"/>
+      <point x="145" y="398" type="line"/>
+      <point x="243" y="492" type="line"/>
+      <point x="73" y="662" type="line"/>
+      <point x="-24" y="566" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="407" type="line"/>
-      <point x="671" y="562" type="line"/>
-      <point x="574" y="658" type="line"/>
-      <point x="417" y="502" type="line"/>
+      <point x="463" y="407" type="line"/>
+      <point x="621" y="562" type="line"/>
+      <point x="524" y="658" type="line"/>
+      <point x="367" y="502" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dollar.glif b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
index 72e80111..13490e0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
@@ -38,16 +38,16 @@
       <point x="197" y="0"/>
     </contour>
     <contour>
-      <point x="226" y="634" type="line"/>
-      <point x="393" y="634" type="line"/>
-      <point x="393" y="821" type="line"/>
-      <point x="226" y="821" type="line"/>
+      <point x="231" y="634" type="line"/>
+      <point x="388" y="634" type="line"/>
+      <point x="388" y="821" type="line"/>
+      <point x="231" y="821" type="line"/>
     </contour>
     <contour>
-      <point x="226" y="-123" type="line"/>
-      <point x="393" y="-123" type="line"/>
-      <point x="393" y="54" type="line"/>
-      <point x="226" y="54" type="line"/>
+      <point x="231" y="-123" type="line"/>
+      <point x="388" y="-123" type="line"/>
+      <point x="388" y="54" type="line"/>
+      <point x="231" y="54" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dong.glif b/src/Cantarell-Bold.ufo/glyphs/dong.glif
index 6c1ba11a..d3de4149 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="645"/>
+  <advance width="600"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="81" y="-175" type="line"/>
-      <point x="593" y="-175" type="line"/>
-      <point x="593" y="-50" type="line"/>
-      <point x="81" y="-50" type="line"/>
+      <point x="73" y="-175" type="line"/>
+      <point x="577" y="-175" type="line"/>
+      <point x="577" y="-50" type="line"/>
+      <point x="73" y="-50" type="line"/>
+    </contour>
+    <contour>
+      <point x="414" y="0" type="line"/>
+      <point x="519" y="0" type="line"/>
+      <point x="519" y="739" type="line"/>
+      <point x="353" y="739" type="line"/>
+      <point x="353" y="120" type="line"/>
+    </contour>
+    <contour>
+      <point x="229" y="-10" type="curve" smooth="yes"/>
+      <point x="297" y="-10"/>
+      <point x="355" y="25"/>
+      <point x="390" y="85" type="curve"/>
+      <point x="361" y="179" type="line"/>
+      <point x="345" y="151"/>
+      <point x="317" y="134"/>
+      <point x="284" y="134" type="curve" smooth="yes"/>
+      <point x="233" y="134"/>
+      <point x="203" y="177"/>
+      <point x="203" y="248" type="curve" smooth="yes"/>
+      <point x="203" y="316"/>
+      <point x="233" y="356"/>
+      <point x="282" y="356" type="curve" smooth="yes"/>
+      <point x="316" y="356"/>
+      <point x="346" y="338"/>
+      <point x="362" y="308" type="curve"/>
+      <point x="398" y="416" type="line"/>
+      <point x="368" y="472"/>
+      <point x="316" y="500"/>
+      <point x="251" y="500" type="curve" smooth="yes"/>
+      <point x="117" y="500"/>
+      <point x="27" y="396"/>
+      <point x="27" y="241" type="curve" smooth="yes"/>
+      <point x="27" y="90"/>
+      <point x="112" y="-10"/>
+    </contour>
+    <contour>
+      <point x="237" y="546" type="line"/>
+      <point x="585" y="546" type="line"/>
+      <point x="585" y="653" type="line"/>
+      <point x="237" y="653" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="16"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/euro.glif b/src/Cantarell-Bold.ufo/glyphs/euro.glif
index 73f82c4f..d7846b84 100644
--- a/src/Cantarell-Bold.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/euro.glif
@@ -4,44 +4,44 @@
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="20" y="385" type="line"/>
-      <point x="530" y="385" type="line"/>
-      <point x="530" y="481" type="line"/>
-      <point x="20" y="481" type="line"/>
+      <point x="21" y="385" type="line"/>
+      <point x="541" y="385" type="line"/>
+      <point x="541" y="490" type="line"/>
+      <point x="21" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="20" y="221" type="line"/>
-      <point x="507" y="221" type="line"/>
-      <point x="507" y="317" type="line"/>
-      <point x="20" y="317" type="line"/>
+      <point x="21" y="209" type="line"/>
+      <point x="524" y="209" type="line"/>
+      <point x="524" y="315" type="line"/>
+      <point x="21" y="315" type="line"/>
     </contour>
     <contour>
-      <point x="381" y="-10" type="curve" smooth="yes"/>
-      <point x="453" y="-10"/>
-      <point x="531" y="10"/>
-      <point x="576" y="39" type="curve"/>
-      <point x="538" y="164" type="line"/>
-      <point x="505" y="150"/>
-      <point x="462" y="142"/>
-      <point x="425" y="142" type="curve" smooth="yes"/>
-      <point x="302" y="142"/>
-      <point x="242" y="216"/>
-      <point x="242" y="359" type="curve" smooth="yes"/>
-      <point x="242" y="491"/>
-      <point x="289" y="551"/>
-      <point x="402" y="551" type="curve" smooth="yes"/>
-      <point x="448" y="551"/>
-      <point x="504" y="542"/>
-      <point x="537" y="525" type="curve"/>
-      <point x="585" y="661" type="line"/>
-      <point x="523" y="690"/>
-      <point x="466" y="704"/>
-      <point x="404" y="704" type="curve" smooth="yes"/>
-      <point x="204" y="704"/>
-      <point x="62" y="560"/>
-      <point x="62" y="342" type="curve" smooth="yes"/>
-      <point x="62" y="127"/>
-      <point x="199" y="-10"/>
+      <point x="399" y="-10" type="curve" smooth="yes"/>
+      <point x="471" y="-10"/>
+      <point x="547" y="10"/>
+      <point x="591" y="39" type="curve"/>
+      <point x="553" y="164" type="line"/>
+      <point x="521" y="150"/>
+      <point x="479" y="142"/>
+      <point x="443" y="142" type="curve" smooth="yes"/>
+      <point x="324" y="142"/>
+      <point x="265" y="216"/>
+      <point x="265" y="359" type="curve" smooth="yes"/>
+      <point x="265" y="491"/>
+      <point x="311" y="551"/>
+      <point x="420" y="551" type="curve" smooth="yes"/>
+      <point x="465" y="551"/>
+      <point x="520" y="542"/>
+      <point x="552" y="525" type="curve"/>
+      <point x="600" y="661" type="line"/>
+      <point x="539" y="690"/>
+      <point x="482" y="704"/>
+      <point x="422" y="704" type="curve" smooth="yes"/>
+      <point x="226" y="704"/>
+      <point x="85" y="560"/>
+      <point x="85" y="342" type="curve" smooth="yes"/>
+      <point x="85" y="127"/>
+      <point x="221" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/florin.glif b/src/Cantarell-Bold.ufo/glyphs/florin.glif
index 60d4d533..45cdec1f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="489"/>
+  <advance width="600"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="107" y="0" type="line"/>
-      <point x="280" y="0" type="line"/>
-      <point x="280" y="534" type="line" smooth="yes"/>
-      <point x="280" y="581"/>
-      <point x="307" y="607"/>
-      <point x="354" y="607" type="curve" smooth="yes"/>
-      <point x="376" y="607"/>
-      <point x="404" y="601"/>
-      <point x="431" y="589" type="curve"/>
-      <point x="467" y="723" type="line"/>
-      <point x="436" y="740"/>
-      <point x="390" y="749"/>
-      <point x="342" y="749" type="curve" smooth="yes"/>
-      <point x="196" y="749"/>
-      <point x="107" y="662"/>
-      <point x="107" y="518" type="curve" smooth="yes"/>
+      <point x="162" y="0" type="line"/>
+      <point x="335" y="0" type="line"/>
+      <point x="335" y="534" type="line" smooth="yes"/>
+      <point x="335" y="581"/>
+      <point x="362" y="607"/>
+      <point x="409" y="607" type="curve" smooth="yes"/>
+      <point x="431" y="607"/>
+      <point x="459" y="601"/>
+      <point x="486" y="589" type="curve"/>
+      <point x="522" y="723" type="line"/>
+      <point x="491" y="740"/>
+      <point x="445" y="749"/>
+      <point x="397" y="749" type="curve" smooth="yes"/>
+      <point x="251" y="749"/>
+      <point x="162" y="662"/>
+      <point x="162" y="518" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="28" y="355" type="line"/>
-      <point x="417" y="355" type="line"/>
-      <point x="417" y="490" type="line"/>
-      <point x="28" y="490" type="line"/>
+      <point x="83" y="355" type="line"/>
+      <point x="472" y="355" type="line"/>
+      <point x="472" y="490" type="line"/>
+      <point x="83" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="107" y="-227" type="line"/>
-      <point x="211" y="-197"/>
-      <point x="280" y="-111"/>
-      <point x="280" y="-13" type="curve" smooth="yes"/>
-      <point x="280" y="0" type="line"/>
-      <point x="107" y="0" type="line"/>
-      <point x="107" y="-25" type="line" smooth="yes"/>
-      <point x="107" y="-70"/>
-      <point x="85" y="-112"/>
-      <point x="52" y="-131" type="curve"/>
+      <point x="162" y="-227" type="line"/>
+      <point x="266" y="-197"/>
+      <point x="335" y="-111"/>
+      <point x="335" y="-13" type="curve" smooth="yes"/>
+      <point x="335" y="0" type="line"/>
+      <point x="162" y="0" type="line"/>
+      <point x="162" y="-25" type="line" smooth="yes"/>
+      <point x="162" y="-70"/>
+      <point x="140" y="-112"/>
+      <point x="107" y="-131" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/franc.glif b/src/Cantarell-Bold.ufo/glyphs/franc.glif
index 8e7a0042..66b7231e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="651"/>
+  <advance width="600"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="49"/>
-    <component base="strokeshortcomb.case" xOffset="10" yOffset="-150"/>
+    <contour>
+      <point x="35" y="67" type="line"/>
+      <point x="410" y="67" type="line"/>
+      <point x="410" y="187" type="line"/>
+      <point x="35" y="187" type="line"/>
+    </contour>
+    <contour>
+      <point x="105" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="257" type="line"/>
+      <point x="524" y="257" type="line"/>
+      <point x="524" y="409" type="line"/>
+      <point x="281" y="409" type="line"/>
+      <point x="281" y="542" type="line"/>
+      <point x="557" y="542" type="line"/>
+      <point x="557" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guarani.glif b/src/Cantarell-Bold.ufo/glyphs/guarani.glif
index 8e0be72b..c782467d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="723"/>
+  <advance width="600"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="8"/>
-    <component base="_currencyvstem" xOffset="214" yOffset="-800"/>
-    <component base="_currencyvstem" xOffset="203" yOffset="-5"/>
+    <contour>
+      <point x="329" y="-10" type="curve" smooth="yes"/>
+      <point x="427" y="-10"/>
+      <point x="507" y="23"/>
+      <point x="576" y="87" type="curve"/>
+      <point x="576" y="406" type="line"/>
+      <point x="303" y="406" type="line"/>
+      <point x="303" y="268" type="line"/>
+      <point x="421" y="268" type="line"/>
+      <point x="421" y="78" type="line"/>
+      <point x="445" y="172" type="line"/>
+      <point x="430" y="147"/>
+      <point x="394" y="132"/>
+      <point x="349" y="132" type="curve" smooth="yes"/>
+      <point x="251" y="132"/>
+      <point x="186" y="216"/>
+      <point x="186" y="353" type="curve" smooth="yes"/>
+      <point x="186" y="487"/>
+      <point x="247" y="560"/>
+      <point x="361" y="560" type="curve" smooth="yes"/>
+      <point x="412" y="560"/>
+      <point x="471" y="548"/>
+      <point x="510" y="532" type="curve"/>
+      <point x="555" y="660" type="line"/>
+      <point x="504" y="688"/>
+      <point x="431" y="704"/>
+      <point x="366" y="704" type="curve" smooth="yes"/>
+      <point x="154" y="704"/>
+      <point x="15" y="556"/>
+      <point x="15" y="339" type="curve" smooth="yes"/>
+      <point x="15" y="130"/>
+      <point x="144" y="-10"/>
+    </contour>
+    <contour>
+      <point x="254" y="-123" type="line"/>
+      <point x="411" y="-123" type="line"/>
+      <point x="411" y="31" type="line"/>
+      <point x="254" y="31" type="line"/>
+    </contour>
+    <contour>
+      <point x="244" y="656" type="line"/>
+      <point x="401" y="656" type="line"/>
+      <point x="401" y="821" type="line"/>
+      <point x="244" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
index b02df3ed..9adac525 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
@@ -3,5 +3,67 @@
   <advance width="600"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="312" y="270" type="curve"/>
+      <point x="82" y="270" type="line"/>
+      <point x="75" y="248"/>
+      <point x="73" y="224"/>
+      <point x="73" y="203" type="curve" smooth="yes"/>
+      <point x="73" y="70"/>
+      <point x="170" y="-10"/>
+      <point x="321" y="-10" type="curve" smooth="yes"/>
+      <point x="401" y="-10"/>
+      <point x="468" y="12"/>
+      <point x="542" y="49" type="curve"/>
+      <point x="497" y="183" type="line"/>
+      <point x="442" y="157"/>
+      <point x="379" y="146"/>
+      <point x="335" y="146" type="curve" smooth="yes"/>
+      <point x="280" y="146"/>
+      <point x="255" y="165"/>
+      <point x="255" y="201" type="curve" smooth="yes"/>
+      <point x="255" y="229"/>
+      <point x="272" y="251"/>
+    </contour>
+    <contour>
+      <point x="20" y="385" type="line"/>
+      <point x="580" y="385" type="line"/>
+      <point x="580" y="490" type="line"/>
+      <point x="20" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="20" y="209" type="line"/>
+      <point x="580" y="209" type="line"/>
+      <point x="580" y="315" type="line"/>
+      <point x="20" y="315" type="line"/>
+    </contour>
+    <contour>
+      <point x="313" y="458" type="curve"/>
+      <point x="511" y="458" type="line"/>
+      <point x="521" y="480"/>
+      <point x="523" y="495"/>
+      <point x="523" y="515" type="curve" smooth="yes"/>
+      <point x="523" y="635"/>
+      <point x="437" y="704"/>
+      <point x="272" y="704" type="curve" smooth="yes"/>
+      <point x="201" y="704"/>
+      <point x="138" y="691"/>
+      <point x="85" y="665" type="curve"/>
+      <point x="123" y="523" type="line"/>
+      <point x="166" y="540"/>
+      <point x="225" y="552"/>
+      <point x="268" y="552" type="curve" smooth="yes"/>
+      <point x="315" y="552"/>
+      <point x="343" y="536"/>
+      <point x="343" y="509" type="curve" smooth="yes"/>
+      <point x="343" y="493"/>
+      <point x="326" y="469"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kip.glif b/src/Cantarell-Bold.ufo/glyphs/kip.glif
index 8bf63fb3..9a84e8cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="753"/>
+  <advance width="600"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="37" y="293" type="line"/>
-      <point x="699" y="293" type="line"/>
-      <point x="699" y="423" type="line"/>
-      <point x="37" y="423" type="line"/>
+      <point x="7" y="297" type="line"/>
+      <point x="565" y="297" type="line"/>
+      <point x="565" y="419" type="line"/>
+      <point x="7" y="419" type="line"/>
     </contour>
     <contour>
-      <point x="502" y="0" type="line"/>
-      <point x="719" y="0" type="line"/>
-      <point x="452" y="394" type="line"/>
-      <point x="470" y="360" type="line"/>
-      <point x="715" y="694" type="line"/>
-      <point x="506" y="694" type="line"/>
-      <point x="269" y="363" type="line"/>
+      <point x="402" y="0" type="line"/>
+      <point x="607" y="0" type="line"/>
+      <point x="389" y="392" type="line"/>
+      <point x="407" y="360" type="line"/>
+      <point x="605" y="694" type="line"/>
+      <point x="408" y="694" type="line"/>
+      <point x="217" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="282" y="0" type="line"/>
-      <point x="282" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="229" y="694" type="line"/>
+      <point x="62" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lira.glif b/src/Cantarell-Bold.ufo/glyphs/lira.glif
index bb27834a..2c3817f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="624"/>
+  <advance width="600"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="61" y="0" type="line"/>
-      <point x="578" y="0" type="line"/>
-      <point x="578" y="156" type="line"/>
-      <point x="238" y="156" type="line"/>
-      <point x="287" y="175"/>
-      <point x="306" y="204"/>
-      <point x="306" y="262" type="curve" smooth="yes"/>
-      <point x="307" y="461" type="line" smooth="yes"/>
-      <point x="307" y="517"/>
-      <point x="351" y="554"/>
-      <point x="429" y="554" type="curve" smooth="yes"/>
-      <point x="464" y="554"/>
-      <point x="509" y="547"/>
-      <point x="543" y="536" type="curve"/>
-      <point x="581" y="677" type="line"/>
-      <point x="539" y="695"/>
-      <point x="490" y="704"/>
-      <point x="436" y="704" type="curve" smooth="yes"/>
-      <point x="255" y="704"/>
-      <point x="130" y="603"/>
-      <point x="132" y="451" type="curve" smooth="yes"/>
-      <point x="134" y="252" type="line" smooth="yes"/>
-      <point x="134" y="199"/>
-      <point x="114" y="173"/>
-      <point x="61" y="156" type="curve"/>
+      <point x="48" y="0" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="564" y="156" type="line"/>
+      <point x="226" y="156" type="line"/>
+      <point x="272" y="174"/>
+      <point x="289" y="219"/>
+      <point x="289" y="322" type="curve" smooth="yes"/>
+      <point x="289" y="461" type="line" smooth="yes"/>
+      <point x="289" y="525"/>
+      <point x="322" y="554"/>
+      <point x="395" y="554" type="curve" smooth="yes"/>
+      <point x="430" y="554"/>
+      <point x="475" y="547"/>
+      <point x="509" y="536" type="curve"/>
+      <point x="547" y="677" type="line"/>
+      <point x="505" y="695"/>
+      <point x="457" y="704"/>
+      <point x="402" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="113" y="613"/>
+      <point x="115" y="451" type="curve" smooth="yes"/>
+      <point x="117" y="312" type="line" smooth="yes"/>
+      <point x="118" y="221"/>
+      <point x="96" y="171"/>
+      <point x="48" y="156" type="curve"/>
     </contour>
     <contour>
-      <point x="64" y="378" type="line"/>
-      <point x="498" y="378" type="line"/>
-      <point x="498" y="488" type="line"/>
-      <point x="64" y="488" type="line"/>
+      <point x="52" y="385" type="line"/>
+      <point x="486" y="385" type="line"/>
+      <point x="486" y="490" type="line"/>
+      <point x="52" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="218" type="line"/>
-      <point x="498" y="218" type="line"/>
-      <point x="498" y="328" type="line"/>
-      <point x="64" y="328" type="line"/>
+      <point x="52" y="209" type="line"/>
+      <point x="486" y="209" type="line"/>
+      <point x="486" y="315" type="line"/>
+      <point x="52" y="315" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
index 22d197db..8e946463 100644
--- a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="679"/>
+  <advance width="600"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="306" y="0" type="line"/>
-      <point x="513" y="0"/>
-      <point x="651" y="138"/>
-      <point x="651" y="345" type="curve"/>
-      <point x="494" y="345" type="line"/>
-      <point x="494" y="222"/>
-      <point x="420" y="140"/>
-      <point x="309" y="140" type="curve"/>
+      <point x="123" y="0" type="line"/>
+      <point x="288" y="0" type="line" smooth="yes"/>
+      <point x="466" y="0"/>
+      <point x="588" y="139"/>
+      <point x="588" y="345" type="curve"/>
+      <point x="432" y="345" type="line"/>
+      <point x="432" y="224"/>
+      <point x="374" y="140"/>
+      <point x="289" y="140" type="curve"/>
+      <point x="289" y="694" type="line"/>
+      <point x="123" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="143" y="0" type="line"/>
-      <point x="309" y="0" type="line"/>
-      <point x="309" y="707" type="line"/>
-      <point x="143" y="707" type="line"/>
+      <point x="72" y="355" type="line"/>
+      <point x="407" y="544" type="line"/>
+      <point x="357" y="636" type="line"/>
+      <point x="22" y="447" type="line"/>
     </contour>
     <contour>
-      <point x="71" y="351" type="line"/>
-      <point x="482" y="571" type="line"/>
-      <point x="433" y="661" type="line"/>
-      <point x="23" y="441" type="line"/>
-    </contour>
-    <contour>
-      <point x="103" y="197" type="line"/>
-      <point x="482" y="400" type="line"/>
-      <point x="433" y="490" type="line"/>
-      <point x="54" y="287" type="line"/>
+      <point x="96" y="175" type="line"/>
+      <point x="421" y="353" type="line"/>
+      <point x="371" y="445" type="line"/>
+      <point x="45" y="267" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/manat.glif b/src/Cantarell-Bold.ufo/glyphs/manat.glif
index ce714fe2..e8dcc8ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="735"/>
+  <advance width="600"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="53" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="223" y="228" type="line" smooth="yes"/>
-      <point x="223" y="366"/>
-      <point x="278" y="458"/>
-      <point x="363" y="458" type="curve" smooth="yes"/>
-      <point x="450" y="458"/>
-      <point x="511" y="362"/>
-      <point x="511" y="218" type="curve" smooth="yes"/>
-      <point x="511" y="0" type="line"/>
-      <point x="681" y="0" type="line"/>
-      <point x="681" y="228" type="line" smooth="yes"/>
-      <point x="681" y="452"/>
-      <point x="558" y="602"/>
-      <point x="371" y="602" type="curve" smooth="yes"/>
-      <point x="182" y="602"/>
-      <point x="53" y="448"/>
-      <point x="53" y="218" type="curve" smooth="yes"/>
+      <point x="3" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="164" y="228" type="line" smooth="yes"/>
+      <point x="164" y="390"/>
+      <point x="211" y="475"/>
+      <point x="300" y="475" type="curve" smooth="yes"/>
+      <point x="389" y="475"/>
+      <point x="435" y="387"/>
+      <point x="435" y="218" type="curve" smooth="yes"/>
+      <point x="435" y="0" type="line"/>
+      <point x="596" y="0" type="line"/>
+      <point x="596" y="228" type="line" smooth="yes"/>
+      <point x="596" y="480"/>
+      <point x="497" y="611"/>
+      <point x="308" y="611" type="curve" smooth="yes"/>
+      <point x="108" y="611"/>
+      <point x="3" y="476"/>
+      <point x="3" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="303" y="100" type="line"/>
-      <point x="433" y="100" type="line"/>
-      <point x="433" y="694" type="line"/>
-      <point x="303" y="694" type="line"/>
+      <point x="239" y="100" type="line"/>
+      <point x="359" y="100" type="line"/>
+      <point x="359" y="694" type="line"/>
+      <point x="239" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/naira.glif b/src/Cantarell-Bold.ufo/glyphs/naira.glif
index 85815a57..96606b34 100644
--- a/src/Cantarell-Bold.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="949"/>
+  <advance width="600"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="763" y="514" type="line"/>
-      <point x="763" y="384" type="line"/>
-      <point x="898" y="384" type="line"/>
-      <point x="898" y="514" type="line"/>
+      <point x="505" y="490" type="line"/>
+      <point x="505" y="384" type="line"/>
+      <point x="600" y="384" type="line"/>
+      <point x="600" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="763" y="314" type="line"/>
-      <point x="763" y="184" type="line"/>
-      <point x="898" y="184" type="line"/>
-      <point x="898" y="314" type="line"/>
+      <point x="505" y="314" type="line"/>
+      <point x="505" y="208" type="line"/>
+      <point x="600" y="208" type="line"/>
+      <point x="600" y="314" type="line"/>
     </contour>
     <contour>
-      <point x="187" y="184" type="line"/>
-      <point x="187" y="314" type="line"/>
-      <point x="51" y="314" type="line"/>
-      <point x="51" y="184" type="line"/>
+      <point x="95" y="208" type="line"/>
+      <point x="95" y="314" type="line"/>
+      <point x="0" y="314" type="line"/>
+      <point x="0" y="208" type="line"/>
     </contour>
     <contour>
-      <point x="187" y="384" type="line"/>
-      <point x="187" y="514" type="line"/>
-      <point x="51" y="514" type="line"/>
-      <point x="51" y="384" type="line"/>
+      <point x="95" y="384" type="line"/>
+      <point x="95" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
+      <point x="0" y="384" type="line"/>
+    </contour>
+    <contour>
+      <point x="70" y="0" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="224" y="494" type="line"/>
+      <point x="197" y="485" type="line"/>
+      <point x="349" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="694" type="line"/>
+      <point x="374" y="694" type="line"/>
+      <point x="372" y="193" type="line"/>
+      <point x="406" y="202" type="line"/>
+      <point x="254" y="694" type="line"/>
+      <point x="70" y="694" type="line"/>
     </contour>
-    <component base="N" xOffset="71"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peseta.glif b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
index 63888d2a..2a7d8a24 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="773"/>
+  <advance width="600"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="612" y="507" type="line"/>
-      <point x="612" y="372" type="line"/>
-      <point x="742" y="372" type="line"/>
-      <point x="742" y="507" type="line"/>
+      <point x="494" y="507" type="line"/>
+      <point x="494" y="372" type="line"/>
+      <point x="621" y="372" type="line"/>
+      <point x="621" y="507" type="line"/>
     </contour>
     <contour>
-      <point x="161" y="372" type="line"/>
-      <point x="161" y="507" type="line"/>
-      <point x="31" y="507" type="line"/>
-      <point x="31" y="372" type="line"/>
+      <point x="105" y="372" type="line"/>
+      <point x="105" y="507" type="line"/>
+      <point x="-11" y="507" type="line"/>
+      <point x="-11" y="372" type="line"/>
+    </contour>
+    <contour>
+      <point x="68" y="0" type="line"/>
+      <point x="241" y="0" type="line"/>
+      <point x="241" y="204" type="line"/>
+      <point x="266" y="204" type="line" smooth="yes"/>
+      <point x="432" y="204"/>
+      <point x="540" y="307"/>
+      <point x="540" y="463" type="curve" smooth="yes"/>
+      <point x="540" y="608"/>
+      <point x="450" y="694"/>
+      <point x="295" y="694" type="curve" smooth="yes"/>
+      <point x="68" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="241" y="356" type="line"/>
+      <point x="241" y="542" type="line"/>
+      <point x="282" y="542" type="line" smooth="yes"/>
+      <point x="329" y="542"/>
+      <point x="360" y="504"/>
+      <point x="360" y="446" type="curve" smooth="yes"/>
+      <point x="360" y="390"/>
+      <point x="335" y="356"/>
+      <point x="297" y="356" type="curve" smooth="yes"/>
     </contour>
-    <component base="P" xOffset="44"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peso.glif b/src/Cantarell-Bold.ufo/glyphs/peso.glif
index 3be0f7a4..00958433 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="801"/>
+  <advance width="600"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="595" y="590" type="line"/>
-      <point x="595" y="470" type="line"/>
-      <point x="752" y="470" type="line"/>
-      <point x="752" y="590" type="line"/>
+      <point x="474" y="590" type="line"/>
+      <point x="474" y="484" type="line"/>
+      <point x="605" y="484" type="line"/>
+      <point x="605" y="590" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="470" type="line"/>
-      <point x="189" y="590" type="line"/>
-      <point x="49" y="590" type="line"/>
-      <point x="49" y="470" type="line"/>
+      <point x="105" y="484" type="line"/>
+      <point x="105" y="590" type="line"/>
+      <point x="-10" y="590" type="line"/>
+      <point x="-10" y="484" type="line"/>
     </contour>
     <contour>
-      <point x="595" y="410" type="line"/>
-      <point x="595" y="290" type="line"/>
-      <point x="752" y="290" type="line"/>
-      <point x="752" y="410" type="line"/>
+      <point x="68" y="0" type="line"/>
+      <point x="241" y="0" type="line"/>
+      <point x="241" y="204" type="line"/>
+      <point x="266" y="204" type="line" smooth="yes"/>
+      <point x="432" y="204"/>
+      <point x="540" y="307"/>
+      <point x="540" y="463" type="curve" smooth="yes"/>
+      <point x="540" y="608"/>
+      <point x="450" y="694"/>
+      <point x="295" y="694" type="curve" smooth="yes"/>
+      <point x="68" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="290" type="line"/>
-      <point x="189" y="410" type="line"/>
-      <point x="49" y="410" type="line"/>
-      <point x="49" y="290" type="line"/>
+      <point x="241" y="356" type="line"/>
+      <point x="241" y="542" type="line"/>
+      <point x="282" y="542" type="line" smooth="yes"/>
+      <point x="329" y="542"/>
+      <point x="360" y="504"/>
+      <point x="360" y="446" type="curve" smooth="yes"/>
+      <point x="360" y="390"/>
+      <point x="335" y="356"/>
+      <point x="297" y="356" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="139" y="0" type="line"/>
-      <point x="312" y="0" type="line"/>
-      <point x="312" y="694" type="line"/>
-      <point x="139" y="694" type="line"/>
+      <point x="474" y="414" type="line"/>
+      <point x="474" y="308" type="line"/>
+      <point x="605" y="308" type="line"/>
+      <point x="605" y="414" type="line"/>
     </contour>
     <contour>
-      <point x="248" y="204" type="line"/>
-      <point x="369" y="204" type="line" smooth="yes"/>
-      <point x="557" y="204"/>
-      <point x="681" y="307"/>
-      <point x="681" y="463" type="curve" smooth="yes"/>
-      <point x="681" y="608"/>
-      <point x="575" y="694"/>
-      <point x="398" y="694" type="curve" smooth="yes"/>
-      <point x="248" y="694" type="line"/>
-      <point x="248" y="552" type="line"/>
-      <point x="384" y="552" type="line" smooth="yes"/>
-      <point x="454" y="552"/>
-      <point x="501" y="510"/>
-      <point x="501" y="446" type="curve" smooth="yes"/>
-      <point x="501" y="386"/>
-      <point x="461" y="346"/>
-      <point x="400" y="346" type="curve" smooth="yes"/>
-      <point x="248" y="346" type="line"/>
+      <point x="105" y="308" type="line"/>
+      <point x="105" y="414" type="line"/>
+      <point x="-10" y="414" type="line"/>
+      <point x="-10" y="308" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ruble.glif b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
index 0c7cd7df..1cf1f929 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="711"/>
+  <advance width="600"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="167" y="0" type="line"/>
-      <point x="340" y="0" type="line"/>
-      <point x="340" y="694" type="line"/>
-      <point x="167" y="694" type="line"/>
+      <point x="108" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="694" type="line"/>
+      <point x="108" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="46" y="80" type="line"/>
-      <point x="472" y="80" type="line"/>
-      <point x="472" y="180" type="line"/>
-      <point x="46" y="180" type="line"/>
+      <point x="30" y="80" type="line"/>
+      <point x="411" y="80" type="line"/>
+      <point x="411" y="180" type="line"/>
+      <point x="30" y="180" type="line"/>
     </contour>
     <contour>
-      <point x="46" y="244" type="line"/>
-      <point x="365" y="244" type="line" smooth="yes"/>
-      <point x="566" y="244"/>
-      <point x="677" y="326"/>
-      <point x="677" y="473" type="curve" smooth="yes"/>
-      <point x="677" y="615"/>
-      <point x="575" y="694"/>
-      <point x="394" y="694" type="curve" smooth="yes"/>
-      <point x="244" y="694" type="line"/>
-      <point x="244" y="542" type="line"/>
-      <point x="380" y="542" type="line" smooth="yes"/>
-      <point x="450" y="542"/>
-      <point x="497" y="504"/>
-      <point x="497" y="446" type="curve" smooth="yes"/>
-      <point x="497" y="390"/>
-      <point x="458" y="356"/>
-      <point x="396" y="356" type="curve" smooth="yes"/>
-      <point x="46" y="356" type="line"/>
+      <point x="30" y="250" type="line"/>
+      <point x="302" y="250" type="line" smooth="yes"/>
+      <point x="481" y="250"/>
+      <point x="581" y="333"/>
+      <point x="581" y="480" type="curve" smooth="yes"/>
+      <point x="581" y="619"/>
+      <point x="492" y="694"/>
+      <point x="331" y="694" type="curve" smooth="yes"/>
+      <point x="182" y="694" type="line"/>
+      <point x="182" y="542" type="line"/>
+      <point x="318" y="542" type="line" smooth="yes"/>
+      <point x="367" y="542"/>
+      <point x="401" y="508"/>
+      <point x="401" y="451" type="curve" smooth="yes"/>
+      <point x="401" y="400"/>
+      <point x="374" y="362"/>
+      <point x="333" y="362" type="curve" smooth="yes"/>
+      <point x="30" y="362" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif b/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
index 192e01af..d279aa48 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="639"/>
+  <advance width="600"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="62" y="214" type="line"/>
-      <point x="241" y="214" type="line" smooth="yes"/>
-      <point x="417" y="214"/>
-      <point x="527" y="333"/>
-      <point x="527" y="482" type="curve" smooth="yes"/>
-      <point x="527" y="629"/>
-      <point x="420" y="694"/>
-      <point x="246" y="694" type="curve" smooth="yes"/>
-      <point x="62" y="694" type="line"/>
-      <point x="62" y="593" type="line"/>
-      <point x="241" y="593" type="line" smooth="yes"/>
-      <point x="309" y="593"/>
-      <point x="347" y="534"/>
-      <point x="347" y="474" type="curve" smooth="yes"/>
-      <point x="347" y="417"/>
-      <point x="313" y="364"/>
-      <point x="246" y="364" type="curve" smooth="yes"/>
-      <point x="62" y="364" type="line"/>
+      <point x="43" y="204" type="line"/>
+      <point x="222" y="204" type="line" smooth="yes"/>
+      <point x="394" y="204"/>
+      <point x="508" y="312"/>
+      <point x="508" y="473" type="curve" smooth="yes"/>
+      <point x="508" y="618"/>
+      <point x="411" y="694"/>
+      <point x="227" y="694" type="curve" smooth="yes"/>
+      <point x="43" y="694" type="line"/>
+      <point x="43" y="594" type="line"/>
+      <point x="222" y="594" type="line" smooth="yes"/>
+      <point x="286" y="594"/>
+      <point x="328" y="542"/>
+      <point x="328" y="465" type="curve" smooth="yes"/>
+      <point x="328" y="394"/>
+      <point x="292" y="354"/>
+      <point x="227" y="354" type="curve" smooth="yes"/>
+      <point x="43" y="354" type="line"/>
     </contour>
     <contour>
-      <point x="382" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="376" y="281" type="line"/>
-      <point x="196" y="281" type="line"/>
+      <point x="383" y="0" type="line"/>
+      <point x="576" y="0" type="line"/>
+      <point x="367" y="271" type="line"/>
+      <point x="187" y="271" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="425" type="line"/>
-      <point x="596" y="425" type="line"/>
-      <point x="596" y="525" type="line"/>
-      <point x="64" y="525" type="line"/>
+      <point x="43" y="424" type="line"/>
+      <point x="577" y="424" type="line"/>
+      <point x="577" y="524" type="line"/>
+      <point x="43" y="524" type="line"/>
     </contour>
     <contour>
-      <point x="64" y="594" type="line"/>
-      <point x="596" y="594" type="line"/>
-      <point x="596" y="694" type="line"/>
-      <point x="64" y="694" type="line"/>
+      <point x="45" y="594" type="line"/>
+      <point x="577" y="594" type="line"/>
+      <point x="577" y="694" type="line"/>
+      <point x="45" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sterling.glif b/src/Cantarell-Bold.ufo/glyphs/sterling.glif
index fd873a93..143811fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="615"/>
+  <advance width="600"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="52" y="0" type="line"/>
-      <point x="569" y="0" type="line"/>
-      <point x="569" y="156" type="line"/>
-      <point x="229" y="156" type="line"/>
-      <point x="276" y="174"/>
-      <point x="296" y="222"/>
-      <point x="297" y="322" type="curve" smooth="yes"/>
-      <point x="298" y="461" type="line" smooth="yes"/>
-      <point x="298" y="517"/>
-      <point x="342" y="554"/>
-      <point x="420" y="554" type="curve" smooth="yes"/>
-      <point x="455" y="554"/>
-      <point x="500" y="547"/>
-      <point x="534" y="536" type="curve"/>
-      <point x="572" y="677" type="line"/>
-      <point x="530" y="695"/>
-      <point x="481" y="704"/>
-      <point x="427" y="704" type="curve" smooth="yes"/>
-      <point x="246" y="704"/>
-      <point x="121" y="603"/>
-      <point x="123" y="451" type="curve" smooth="yes"/>
-      <point x="125" y="312" type="line" smooth="yes"/>
-      <point x="126" y="226"/>
-      <point x="100" y="171"/>
-      <point x="52" y="156" type="curve"/>
+      <point x="48" y="0" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="564" y="156" type="line"/>
+      <point x="226" y="156" type="line"/>
+      <point x="272" y="174"/>
+      <point x="289" y="219"/>
+      <point x="289" y="322" type="curve" smooth="yes"/>
+      <point x="289" y="461" type="line" smooth="yes"/>
+      <point x="289" y="525"/>
+      <point x="322" y="554"/>
+      <point x="395" y="554" type="curve" smooth="yes"/>
+      <point x="430" y="554"/>
+      <point x="475" y="547"/>
+      <point x="509" y="536" type="curve"/>
+      <point x="547" y="677" type="line"/>
+      <point x="505" y="695"/>
+      <point x="457" y="704"/>
+      <point x="402" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="113" y="613"/>
+      <point x="115" y="451" type="curve" smooth="yes"/>
+      <point x="117" y="312" type="line" smooth="yes"/>
+      <point x="118" y="221"/>
+      <point x="96" y="171"/>
+      <point x="48" y="156" type="curve"/>
     </contour>
     <contour>
-      <point x="50" y="292" type="line"/>
-      <point x="472" y="292" type="line"/>
-      <point x="472" y="413" type="line"/>
-      <point x="50" y="413" type="line"/>
+      <point x="54" y="292" type="line"/>
+      <point x="446" y="292" type="line"/>
+      <point x="446" y="413" type="line"/>
+      <point x="54" y="413" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tenge.glif b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
index a067c2d7..81cdfacc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tenge.glif
@@ -3,5 +3,27 @@
   <advance width="600"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="208" y="0" type="line"/>
+      <point x="378" y="0" type="line"/>
+      <point x="378" y="424" type="line"/>
+      <point x="566" y="424" type="line"/>
+      <point x="566" y="524" type="line"/>
+      <point x="34" y="524" type="line"/>
+      <point x="34" y="424" type="line"/>
+      <point x="208" y="424" type="line"/>
+    </contour>
+    <contour>
+      <point x="34" y="594" type="line"/>
+      <point x="566" y="594" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="34" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
index f5d41ab5..77a81825 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
@@ -3,5 +3,33 @@
   <advance width="600"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="50" y="542" type="line"/>
+      <point x="219" y="542" type="line"/>
+      <point x="219" y="0" type="line"/>
+      <point x="379" y="0" type="line"/>
+      <point x="379" y="542" type="line"/>
+      <point x="550" y="542" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="50" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="133" y="238" type="line"/>
+      <point x="499" y="410" type="line"/>
+      <point x="458" y="503" type="line"/>
+      <point x="92" y="331" type="line"/>
+    </contour>
+    <contour>
+      <point x="157" y="58" type="line"/>
+      <point x="513" y="219" type="line"/>
+      <point x="472" y="312" type="line"/>
+      <point x="115" y="151" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/won.glif b/src/Cantarell-Bold.ufo/glyphs/won.glif
index a5505141..c9a85a45 100644
--- a/src/Cantarell-Bold.ufo/glyphs/won.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1176"/>
+  <advance width="600"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="56" y="192" type="line"/>
-      <point x="268" y="192" type="line"/>
-      <point x="268" y="312" type="line"/>
-      <point x="56" y="312" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="255" y="0" type="line"/>
+      <point x="320" y="644" type="line"/>
+      <point x="276" y="644" type="line"/>
+      <point x="350" y="0" type="line"/>
+      <point x="495" y="0" type="line"/>
+      <point x="602" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+      <point x="393" y="48" type="line"/>
+      <point x="435" y="48" type="line"/>
+      <point x="376" y="685" type="line"/>
+      <point x="237" y="685" type="line"/>
+      <point x="170" y="53" type="line"/>
+      <point x="208" y="53" type="line"/>
+      <point x="149" y="694" type="line"/>
+      <point x="-1" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="56" y="392" type="line"/>
-      <point x="488" y="392" type="line"/>
-      <point x="488" y="512" type="line"/>
-      <point x="56" y="512" type="line"/>
+      <point x="0" y="385" type="line"/>
+      <point x="601" y="385" type="line"/>
+      <point x="601" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="1120" y="192" type="line"/>
-      <point x="1120" y="312" type="line"/>
-      <point x="898" y="312" type="line"/>
-      <point x="898" y="192" type="line"/>
+      <point x="-1" y="208" type="line"/>
+      <point x="131" y="208" type="line"/>
+      <point x="131" y="314" type="line"/>
+      <point x="-1" y="314" type="line"/>
     </contour>
     <contour>
-      <point x="1120" y="392" type="line"/>
-      <point x="1120" y="512" type="line"/>
-      <point x="678" y="512" type="line"/>
-      <point x="678" y="392" type="line"/>
+      <point x="468" y="208" type="line"/>
+      <point x="600" y="208" type="line"/>
+      <point x="600" y="314" type="line"/>
+      <point x="468" y="314" type="line"/>
     </contour>
-    <component base="W" xOffset="73"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yen.glif b/src/Cantarell-Bold.ufo/glyphs/yen.glif
index cbd81e35..69c60040 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="728"/>
+  <advance width="600"/>
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="92" y="67" type="line"/>
-      <point x="643" y="67" type="line"/>
-      <point x="643" y="187" type="line"/>
-      <point x="92" y="187" type="line"/>
+      <point x="219" y="0" type="line"/>
+      <point x="392" y="0" type="line"/>
+      <point x="392" y="297" type="line"/>
+      <point x="611" y="694" type="line"/>
+      <point x="417" y="694" type="line"/>
+      <point x="300" y="410" type="line"/>
+      <point x="322" y="410" type="line"/>
+      <point x="193" y="694" type="line"/>
+      <point x="-11" y="694" type="line"/>
+      <point x="219" y="301" type="line"/>
     </contour>
     <contour>
-      <point x="92" y="258" type="line"/>
-      <point x="643" y="258" type="line"/>
-      <point x="643" y="378" type="line"/>
-      <point x="92" y="378" type="line"/>
+      <point x="61" y="82" type="line"/>
+      <point x="550" y="82" type="line"/>
+      <point x="550" y="188" type="line"/>
+      <point x="61" y="188" type="line"/>
     </contour>
     <contour>
-      <point x="281" y="0" type="line"/>
-      <point x="454" y="0" type="line"/>
-      <point x="454" y="297" type="line"/>
-      <point x="708" y="694" type="line"/>
-      <point x="514" y="694" type="line"/>
-      <point x="362" y="410" type="line"/>
-      <point x="384" y="410" type="line"/>
-      <point x="220" y="694" type="line"/>
-      <point x="16" y="694" type="line"/>
-      <point x="281" y="301" type="line"/>
+      <point x="61" y="258" type="line"/>
+      <point x="550" y="258" type="line"/>
+      <point x="550" y="364" type="line"/>
+      <point x="61" y="364" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index 2597e0a3..bdbb7a1c 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -2133,6 +2133,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2143,11 +2144,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -3565,9 +3565,6 @@
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
   </dict>
 </plist>
diff --git a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
index 3a90ad4a..3fdd2303 100644
--- a/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Light.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="600"/>
   <outline>
     <contour>
-      <point x="408" y="685" type="line"/>
-      <point x="426" y="685" type="line"/>
-      <point x="426" y="840" type="line"/>
-      <point x="408" y="840" type="line"/>
+      <point x="408" y="703" type="line"/>
+      <point x="426" y="703" type="line"/>
+      <point x="426" y="823" type="line"/>
+      <point x="408" y="823" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cedi.glif b/src/Cantarell-Light.ufo/glyphs/cedi.glif
index 24b0d2af..7c7ecda7 100644
--- a/src/Cantarell-Light.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="694"/>
+  <advance width="580"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="20"/>
-    <component base="_currencyvstem" xOffset="4"/>
-    <component base="_currencyvstem" xOffset="-6" yOffset="-840"/>
+    <contour>
+      <point x="349" y="-10" type="curve" smooth="yes"/>
+      <point x="406" y="-10"/>
+      <point x="470" y="6"/>
+      <point x="523" y="33" type="curve"/>
+      <point x="518" y="49" type="line"/>
+      <point x="467" y="24"/>
+      <point x="404" y="9"/>
+      <point x="353" y="9" type="curve" smooth="yes"/>
+      <point x="196" y="9"/>
+      <point x="89" y="145"/>
+      <point x="89" y="348" type="curve" smooth="yes"/>
+      <point x="89" y="549"/>
+      <point x="198" y="683"/>
+      <point x="361" y="683" type="curve" smooth="yes"/>
+      <point x="413" y="683"/>
+      <point x="467" y="670"/>
+      <point x="517" y="645" type="curve"/>
+      <point x="524" y="662" type="line"/>
+      <point x="474" y="689"/>
+      <point x="419" y="702"/>
+      <point x="364" y="702" type="curve" smooth="yes"/>
+      <point x="186" y="702"/>
+      <point x="67" y="556"/>
+      <point x="67" y="338" type="curve" smooth="yes"/>
+      <point x="67" y="129"/>
+      <point x="181" y="-10"/>
+    </contour>
+    <contour>
+      <point x="350" y="693" type="line"/>
+      <point x="368" y="693" type="line"/>
+      <point x="368" y="813" type="line"/>
+      <point x="350" y="813" type="line"/>
+    </contour>
+    <contour>
+      <point x="341" y="-120" type="line"/>
+      <point x="359" y="-120" type="line"/>
+      <point x="359" y="0" type="line"/>
+      <point x="341" y="0" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cent.glif b/src/Cantarell-Light.ufo/glyphs/cent.glif
index 14555a3d..9f125cd8 100644
--- a/src/Cantarell-Light.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cent.glif
@@ -3,9 +3,9 @@
   <advance width="580"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="35"/>
-    <component base="_currencyvstem" xOffset="-125" yOffset="-223"/>
-    <component base="_currencyvstem" xOffset="-110" yOffset="-823"/>
+    <component base="c" xOffset="68"/>
+    <component base="_currencyvstem" xOffset="-92" yOffset="-223"/>
+    <component base="_currencyvstem" xOffset="-77" yOffset="-823"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/colonsign.glif b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
index c17b3e0c..cd86ca65 100644
--- a/src/Cantarell-Light.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="695"/>
+  <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="492" y="694" type="line"/>
-      <point x="508" y="694" type="line"/>
-      <point x="529" y="824" type="line"/>
-      <point x="513" y="824" type="line"/>
+      <point x="422" y="694" type="line"/>
+      <point x="438" y="694" type="line"/>
+      <point x="456" y="813" type="line"/>
+      <point x="440" y="813" type="line"/>
     </contour>
     <contour>
-      <point x="300" y="-130" type="line"/>
-      <point x="316" y="-130" type="line"/>
-      <point x="337" y="11" type="line"/>
-      <point x="321" y="11" type="line"/>
+      <point x="255" y="-120" type="line"/>
+      <point x="270" y="-120" type="line"/>
+      <point x="289" y="11" type="line"/>
+      <point x="273" y="11" type="line"/>
     </contour>
     <contour>
-      <point x="400" y="694" type="line"/>
-      <point x="416" y="694" type="line"/>
-      <point x="437" y="824" type="line"/>
-      <point x="421" y="824" type="line"/>
+      <point x="341" y="694" type="line"/>
+      <point x="357" y="694" type="line"/>
+      <point x="375" y="813" type="line"/>
+      <point x="360" y="813" type="line"/>
     </contour>
     <contour>
-      <point x="391" y="-130" type="line"/>
-      <point x="407" y="-130" type="line"/>
-      <point x="426" y="3" type="line"/>
-      <point x="410" y="3" type="line"/>
+      <point x="335" y="-120" type="line"/>
+      <point x="350" y="-120" type="line"/>
+      <point x="367" y="3" type="line"/>
+      <point x="351" y="3" type="line"/>
+    </contour>
+    <contour>
+      <point x="352" y="-10" type="curve" smooth="yes"/>
+      <point x="409" y="-10"/>
+      <point x="473" y="6"/>
+      <point x="526" y="33" type="curve"/>
+      <point x="521" y="49" type="line"/>
+      <point x="470" y="24"/>
+      <point x="407" y="9"/>
+      <point x="356" y="9" type="curve" smooth="yes"/>
+      <point x="199" y="9"/>
+      <point x="92" y="145"/>
+      <point x="92" y="348" type="curve" smooth="yes"/>
+      <point x="92" y="549"/>
+      <point x="201" y="683"/>
+      <point x="364" y="683" type="curve" smooth="yes"/>
+      <point x="416" y="683"/>
+      <point x="470" y="670"/>
+      <point x="520" y="645" type="curve"/>
+      <point x="527" y="662" type="line"/>
+      <point x="477" y="689"/>
+      <point x="422" y="702"/>
+      <point x="367" y="702" type="curve" smooth="yes"/>
+      <point x="189" y="702"/>
+      <point x="70" y="556"/>
+      <point x="70" y="338" type="curve" smooth="yes"/>
+      <point x="70" y="129"/>
+      <point x="184" y="-10"/>
     </contour>
-    <component base="C" xOffset="21"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/currency.glif b/src/Cantarell-Light.ufo/glyphs/currency.glif
index b2139f8f..e2a5d7bf 100644
--- a/src/Cantarell-Light.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Light.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="622"/>
+  <advance width="580"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="310" y="159" type="curve" smooth="yes"/>
-      <point x="414" y="159"/>
-      <point x="483" y="231"/>
-      <point x="483" y="339" type="curve" smooth="yes"/>
-      <point x="483" y="443"/>
-      <point x="415" y="513"/>
-      <point x="313" y="513" type="curve" smooth="yes"/>
-      <point x="209" y="513"/>
-      <point x="140" y="442"/>
-      <point x="140" y="335" type="curve" smooth="yes"/>
-      <point x="140" y="229"/>
-      <point x="208" y="159"/>
+      <point x="290" y="159" type="curve" smooth="yes"/>
+      <point x="394" y="159"/>
+      <point x="463" y="231"/>
+      <point x="463" y="339" type="curve" smooth="yes"/>
+      <point x="463" y="443"/>
+      <point x="395" y="513"/>
+      <point x="293" y="513" type="curve" smooth="yes"/>
+      <point x="189" y="513"/>
+      <point x="120" y="442"/>
+      <point x="120" y="335" type="curve" smooth="yes"/>
+      <point x="120" y="229"/>
+      <point x="188" y="159"/>
     </contour>
     <contour>
-      <point x="101" y="105" type="line"/>
-      <point x="203" y="204" type="line"/>
-      <point x="191" y="216" type="line"/>
-      <point x="89" y="117" type="line"/>
+      <point x="81" y="105" type="line"/>
+      <point x="183" y="204" type="line"/>
+      <point x="171" y="216" type="line"/>
+      <point x="69" y="117" type="line"/>
     </contour>
     <contour>
-      <point x="521" y="105" type="line"/>
-      <point x="533" y="117" type="line"/>
-      <point x="429" y="218" type="line"/>
-      <point x="417" y="206" type="line"/>
+      <point x="501" y="105" type="line"/>
+      <point x="513" y="117" type="line"/>
+      <point x="409" y="218" type="line"/>
+      <point x="397" y="206" type="line"/>
     </contour>
     <contour>
-      <point x="313" y="177" type="curve" smooth="yes"/>
-      <point x="222" y="177"/>
-      <point x="161" y="241"/>
-      <point x="161" y="338" type="curve" smooth="yes"/>
-      <point x="161" y="432"/>
-      <point x="221" y="495"/>
-      <point x="310" y="495" type="curve" smooth="yes"/>
-      <point x="401" y="495"/>
-      <point x="462" y="431"/>
-      <point x="462" y="336" type="curve" smooth="yes"/>
-      <point x="462" y="241"/>
-      <point x="402" y="177"/>
+      <point x="293" y="177" type="curve" smooth="yes"/>
+      <point x="202" y="177"/>
+      <point x="141" y="241"/>
+      <point x="141" y="338" type="curve" smooth="yes"/>
+      <point x="141" y="432"/>
+      <point x="201" y="495"/>
+      <point x="290" y="495" type="curve" smooth="yes"/>
+      <point x="381" y="495"/>
+      <point x="442" y="431"/>
+      <point x="442" y="336" type="curve" smooth="yes"/>
+      <point x="442" y="241"/>
+      <point x="382" y="177"/>
     </contour>
     <contour>
-      <point x="187" y="454" type="line"/>
-      <point x="199" y="466" type="line"/>
-      <point x="101" y="566" type="line"/>
-      <point x="89" y="554" type="line"/>
+      <point x="167" y="454" type="line"/>
+      <point x="179" y="466" type="line"/>
+      <point x="81" y="566" type="line"/>
+      <point x="69" y="554" type="line"/>
     </contour>
     <contour>
-      <point x="433" y="454" type="line"/>
-      <point x="533" y="554" type="line"/>
-      <point x="521" y="566" type="line"/>
-      <point x="421" y="466" type="line"/>
+      <point x="413" y="454" type="line"/>
+      <point x="513" y="554" type="line"/>
+      <point x="501" y="566" type="line"/>
+      <point x="401" y="466" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dong.glif b/src/Cantarell-Light.ufo/glyphs/dong.glif
index 0a4663d1..7315937e 100644
--- a/src/Cantarell-Light.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="628"/>
+  <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="139" y="-117" type="line"/>
-      <point x="521" y="-117" type="line"/>
-      <point x="521" y="-100" type="line"/>
-      <point x="139" y="-100" type="line"/>
+      <point x="125" y="-117" type="line"/>
+      <point x="498" y="-117" type="line"/>
+      <point x="498" y="-100" type="line"/>
+      <point x="125" y="-100" type="line"/>
+    </contour>
+    <contour>
+      <point x="442" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="739" type="line"/>
+      <point x="439" y="739" type="line"/>
+      <point x="439" y="64" type="line"/>
+    </contour>
+    <contour>
+      <point x="284" y="-10" type="curve" smooth="yes"/>
+      <point x="353" y="-10"/>
+      <point x="409" y="23"/>
+      <point x="444" y="85" type="curve"/>
+      <point x="441" y="106" type="line"/>
+      <point x="410" y="44"/>
+      <point x="356" y="8"/>
+      <point x="286" y="8" type="curve" smooth="yes"/>
+      <point x="172" y="8"/>
+      <point x="99" y="102"/>
+      <point x="99" y="239" type="curve" smooth="yes"/>
+      <point x="99" y="373"/>
+      <point x="169" y="468"/>
+      <point x="281" y="468" type="curve" smooth="yes"/>
+      <point x="353" y="468"/>
+      <point x="410" y="431"/>
+      <point x="441" y="367" type="curve"/>
+      <point x="445" y="396" type="line"/>
+      <point x="412" y="454"/>
+      <point x="357" y="486"/>
+      <point x="286" y="486" type="curve" smooth="yes"/>
+      <point x="161" y="486"/>
+      <point x="78" y="385"/>
+      <point x="78" y="237" type="curve" smooth="yes"/>
+      <point x="78" y="90"/>
+      <point x="160" y="-10"/>
+    </contour>
+    <contour>
+      <point x="293" y="584" type="line"/>
+      <point x="515" y="584" type="line"/>
+      <point x="515" y="600" type="line"/>
+      <point x="293" y="600" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="34"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/euro.glif b/src/Cantarell-Light.ufo/glyphs/euro.glif
index 3c522854..807afb93 100644
--- a/src/Cantarell-Light.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/euro.glif
@@ -4,44 +4,44 @@
   <unicode hex="20AC"/>
   <outline>
     <contour>
-      <point x="20" y="426" type="line"/>
-      <point x="503" y="426" type="line"/>
-      <point x="503" y="443" type="line"/>
-      <point x="20" y="443" type="line"/>
+      <point x="25" y="418" type="line"/>
+      <point x="493" y="418" type="line"/>
+      <point x="493" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
     </contour>
     <contour>
-      <point x="20" y="266" type="line"/>
-      <point x="482" y="266" type="line"/>
-      <point x="482" y="283" type="line"/>
-      <point x="20" y="283" type="line"/>
+      <point x="25" y="261" type="line"/>
+      <point x="473" y="261" type="line"/>
+      <point x="473" y="278" type="line"/>
+      <point x="25" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="384" y="-10" type="curve" smooth="yes"/>
-      <point x="442" y="-10"/>
-      <point x="508" y="6"/>
-      <point x="562" y="33" type="curve"/>
-      <point x="557" y="49" type="line"/>
-      <point x="504" y="24"/>
-      <point x="441" y="9"/>
-      <point x="388" y="9" type="curve" smooth="yes"/>
-      <point x="227" y="9"/>
-      <point x="118" y="145"/>
-      <point x="118" y="348" type="curve" smooth="yes"/>
-      <point x="118" y="549"/>
-      <point x="229" y="683"/>
-      <point x="396" y="683" type="curve" smooth="yes"/>
-      <point x="449" y="683"/>
-      <point x="505" y="670"/>
-      <point x="556" y="645" type="curve"/>
-      <point x="563" y="662" type="line"/>
-      <point x="512" y="689"/>
-      <point x="455" y="702"/>
-      <point x="399" y="702" type="curve" smooth="yes"/>
-      <point x="218" y="702"/>
-      <point x="96" y="556"/>
-      <point x="96" y="338" type="curve" smooth="yes"/>
-      <point x="96" y="129"/>
-      <point x="212" y="-10"/>
+      <point x="382" y="-10" type="curve" smooth="yes"/>
+      <point x="439" y="-10"/>
+      <point x="504" y="6"/>
+      <point x="557" y="33" type="curve"/>
+      <point x="552" y="49" type="line"/>
+      <point x="500" y="24"/>
+      <point x="438" y="9"/>
+      <point x="386" y="9" type="curve" smooth="yes"/>
+      <point x="229" y="9"/>
+      <point x="121" y="145"/>
+      <point x="121" y="348" type="curve" smooth="yes"/>
+      <point x="121" y="549"/>
+      <point x="231" y="683"/>
+      <point x="394" y="683" type="curve" smooth="yes"/>
+      <point x="446" y="683"/>
+      <point x="501" y="670"/>
+      <point x="551" y="645" type="curve"/>
+      <point x="558" y="662" type="line"/>
+      <point x="508" y="689"/>
+      <point x="451" y="702"/>
+      <point x="397" y="702" type="curve" smooth="yes"/>
+      <point x="220" y="702"/>
+      <point x="100" y="556"/>
+      <point x="100" y="338" type="curve" smooth="yes"/>
+      <point x="100" y="129"/>
+      <point x="214" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/florin.glif b/src/Cantarell-Light.ufo/glyphs/florin.glif
index ff255cd3..55d44d1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Light.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="430"/>
+  <advance width="580"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="164" y="0" type="line"/>
-      <point x="184" y="0" type="line"/>
-      <point x="184" y="636" type="line" smooth="yes"/>
-      <point x="184" y="695"/>
-      <point x="218" y="731"/>
-      <point x="275" y="731" type="curve" smooth="yes"/>
-      <point x="302" y="731"/>
-      <point x="331" y="723"/>
-      <point x="350" y="711" type="curve"/>
-      <point x="356" y="727" type="line"/>
-      <point x="335" y="741"/>
-      <point x="307" y="749"/>
-      <point x="278" y="749" type="curve" smooth="yes"/>
-      <point x="211" y="749"/>
-      <point x="164" y="702"/>
-      <point x="164" y="631" type="curve" smooth="yes"/>
+      <point x="240" y="0" type="line"/>
+      <point x="260" y="0" type="line"/>
+      <point x="260" y="636" type="line" smooth="yes"/>
+      <point x="260" y="695"/>
+      <point x="294" y="731"/>
+      <point x="351" y="731" type="curve" smooth="yes"/>
+      <point x="378" y="731"/>
+      <point x="407" y="723"/>
+      <point x="426" y="711" type="curve"/>
+      <point x="432" y="727" type="line"/>
+      <point x="411" y="741"/>
+      <point x="383" y="749"/>
+      <point x="354" y="749" type="curve" smooth="yes"/>
+      <point x="287" y="749"/>
+      <point x="240" y="702"/>
+      <point x="240" y="631" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="87" y="463" type="line"/>
-      <point x="338" y="463" type="line"/>
-      <point x="338" y="480" type="line"/>
-      <point x="87" y="480" type="line"/>
+      <point x="163" y="463" type="line"/>
+      <point x="414" y="463" type="line"/>
+      <point x="414" y="480" type="line"/>
+      <point x="163" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="78" y="-217" type="line"/>
-      <point x="142" y="-187"/>
-      <point x="184" y="-110"/>
-      <point x="184" y="-23" type="curve" smooth="yes"/>
-      <point x="184" y="0" type="line"/>
-      <point x="164" y="0" type="line"/>
-      <point x="164" y="-35" type="line" smooth="yes"/>
-      <point x="164" y="-104"/>
-      <point x="127" y="-173"/>
-      <point x="73" y="-207" type="curve"/>
+      <point x="154" y="-217" type="line"/>
+      <point x="218" y="-187"/>
+      <point x="260" y="-110"/>
+      <point x="260" y="-23" type="curve" smooth="yes"/>
+      <point x="260" y="0" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="240" y="-35" type="line" smooth="yes"/>
+      <point x="240" y="-104"/>
+      <point x="203" y="-173"/>
+      <point x="149" y="-207" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/franc.glif b/src/Cantarell-Light.ufo/glyphs/franc.glif
index aea91e9e..f61f4943 100644
--- a/src/Cantarell-Light.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Light.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="611"/>
+  <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="40"/>
-    <component base="strokeshortcomb.case" xScale="0.9" xOffset="-32" yOffset="-121"/>
+    <contour>
+      <point x="68" y="209" type="line"/>
+      <point x="314" y="209" type="line"/>
+      <point x="314" y="226" type="line"/>
+      <point x="68" y="226" type="line"/>
+    </contour>
+    <contour>
+      <point x="153" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="366" type="line"/>
+      <point x="477" y="366" type="line"/>
+      <point x="477" y="384" type="line"/>
+      <point x="175" y="384" type="line"/>
+      <point x="175" y="676" type="line"/>
+      <point x="498" y="676" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="153" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guarani.glif b/src/Cantarell-Light.ufo/glyphs/guarani.glif
index d979e916..23069f8e 100644
--- a/src/Cantarell-Light.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="753"/>
+  <advance width="580"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="3" yOffset="-840"/>
-    <component base="_currencyvstem" xOffset="-8"/>
+    <contour>
+      <point x="324" y="-10" type="curve" smooth="yes"/>
+      <point x="400" y="-10"/>
+      <point x="484" y="19"/>
+      <point x="533" y="60" type="curve"/>
+      <point x="533" y="338" type="line"/>
+      <point x="311" y="338" type="line"/>
+      <point x="311" y="319" type="line"/>
+      <point x="511" y="319" type="line"/>
+      <point x="511" y="57" type="line"/>
+      <point x="516" y="69" type="line"/>
+      <point x="462" y="32"/>
+      <point x="392" y="9"/>
+      <point x="327" y="9" type="curve" smooth="yes"/>
+      <point x="171" y="9"/>
+      <point x="67" y="143"/>
+      <point x="67" y="348" type="curve" smooth="yes"/>
+      <point x="67" y="554"/>
+      <point x="172" y="680"/>
+      <point x="338" y="680" type="curve" smooth="yes"/>
+      <point x="396" y="680"/>
+      <point x="459" y="664"/>
+      <point x="503" y="634" type="curve"/>
+      <point x="509" y="651" type="line"/>
+      <point x="462" y="683"/>
+      <point x="403" y="699"/>
+      <point x="341" y="699" type="curve" smooth="yes"/>
+      <point x="159" y="699"/>
+      <point x="44" y="564"/>
+      <point x="44" y="345" type="curve" smooth="yes"/>
+      <point x="44" y="130"/>
+      <point x="156" y="-10"/>
+    </contour>
+    <contour>
+      <point x="325" y="-120" type="line"/>
+      <point x="343" y="-120" type="line"/>
+      <point x="343" y="0" type="line"/>
+      <point x="325" y="0" type="line"/>
+    </contour>
+    <contour>
+      <point x="315" y="693" type="line"/>
+      <point x="333" y="693" type="line"/>
+      <point x="333" y="813" type="line"/>
+      <point x="315" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
index b02df3ed..7b8b5bec 100644
--- a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
@@ -1,7 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hryvnia" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="167" y="273" type="curve"/>
+      <point x="138" y="273" type="line"/>
+      <point x="117" y="246"/>
+      <point x="108" y="212"/>
+      <point x="108" y="173" type="curve" smooth="yes"/>
+      <point x="108" y="62"/>
+      <point x="187" y="-10"/>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="367" y="-10"/>
+      <point x="432" y="8"/>
+      <point x="493" y="42" type="curve"/>
+      <point x="486" y="58" type="line"/>
+      <point x="412" y="22"/>
+      <point x="362" y="9"/>
+      <point x="312" y="9" type="curve" smooth="yes"/>
+      <point x="204" y="9"/>
+      <point x="130" y="76"/>
+      <point x="130" y="174" type="curve" smooth="yes"/>
+      <point x="130" y="213"/>
+      <point x="142" y="247"/>
+    </contour>
+    <contour>
+      <point x="25" y="418" type="line"/>
+      <point x="555" y="418" type="line"/>
+      <point x="555" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
+    </contour>
+    <contour>
+      <point x="25" y="261" type="line"/>
+      <point x="555" y="261" type="line"/>
+      <point x="555" y="278" type="line"/>
+      <point x="25" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="407" y="428" type="curve"/>
+      <point x="439" y="428" type="line"/>
+      <point x="462" y="452"/>
+      <point x="476" y="496"/>
+      <point x="476" y="540" type="curve" smooth="yes"/>
+      <point x="476" y="644"/>
+      <point x="407" y="702"/>
+      <point x="283" y="702" type="curve" smooth="yes"/>
+      <point x="221" y="702"/>
+      <point x="165" y="687"/>
+      <point x="126" y="663" type="curve"/>
+      <point x="133" y="645" type="line"/>
+      <point x="178" y="671"/>
+      <point x="226" y="683"/>
+      <point x="279" y="683" type="curve" smooth="yes"/>
+      <point x="392" y="683"/>
+      <point x="454" y="632"/>
+      <point x="454" y="540" type="curve" smooth="yes"/>
+      <point x="454" y="494"/>
+      <point x="436" y="451"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kip.glif b/src/Cantarell-Light.ufo/glyphs/kip.glif
index ae1e2a23..77c12c95 100644
--- a/src/Cantarell-Light.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="651"/>
+  <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="74" y="351" type="line"/>
-      <point x="526" y="351" type="line"/>
-      <point x="526" y="368" type="line"/>
-      <point x="74" y="368" type="line"/>
+      <point x="73" y="351" type="line"/>
+      <point x="482" y="351" type="line"/>
+      <point x="482" y="368" type="line"/>
+      <point x="73" y="368" type="line"/>
     </contour>
     <contour>
-      <point x="549" y="0" type="line"/>
-      <point x="579" y="0" type="line"/>
-      <point x="203" y="366" type="line"/>
-      <point x="203" y="356" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="536" y="694" type="line"/>
-      <point x="184" y="360" type="line"/>
+      <point x="479" y="0" type="line"/>
+      <point x="508" y="0" type="line"/>
+      <point x="188" y="366" type="line"/>
+      <point x="189" y="356" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="468" y="694" type="line"/>
+      <point x="169" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="162" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="182" y="694" type="line"/>
-      <point x="162" y="694" type="line"/>
+      <point x="148" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="168" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lira.glif b/src/Cantarell-Light.ufo/glyphs/lira.glif
index 8505a3ff..576cea3e 100644
--- a/src/Cantarell-Light.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="613"/>
+  <advance width="580"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="84" y="0" type="line"/>
-      <point x="541" y="0" type="line"/>
-      <point x="541" y="17" type="line"/>
-      <point x="118" y="17" type="line"/>
-      <point x="166" y="38"/>
-      <point x="195" y="107"/>
-      <point x="195" y="201" type="curve" smooth="yes"/>
-      <point x="195" y="484" type="line" smooth="yes"/>
-      <point x="195" y="605"/>
-      <point x="268" y="685"/>
-      <point x="379" y="685" type="curve" smooth="yes"/>
-      <point x="411" y="685"/>
-      <point x="454" y="679"/>
-      <point x="499" y="665" type="curve"/>
-      <point x="505" y="681" type="line"/>
-      <point x="467" y="695"/>
-      <point x="420" y="704"/>
-      <point x="382" y="704" type="curve" smooth="yes"/>
-      <point x="257" y="704"/>
-      <point x="175" y="615"/>
-      <point x="175" y="481" type="curve" smooth="yes"/>
-      <point x="175" y="198" type="line" smooth="yes"/>
-      <point x="175" y="106"/>
-      <point x="141" y="38"/>
-      <point x="84" y="17" type="curve"/>
+      <point x="69" y="0" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="516" y="17" type="line"/>
+      <point x="103" y="17" type="line"/>
+      <point x="153" y="40"/>
+      <point x="188" y="116"/>
+      <point x="188" y="201" type="curve" smooth="yes"/>
+      <point x="188" y="484" type="line" smooth="yes"/>
+      <point x="188" y="614"/>
+      <point x="248" y="685"/>
+      <point x="358" y="685" type="curve" smooth="yes"/>
+      <point x="393" y="685"/>
+      <point x="434" y="678"/>
+      <point x="475" y="665" type="curve"/>
+      <point x="481" y="681" type="line"/>
+      <point x="441" y="696"/>
+      <point x="400" y="704"/>
+      <point x="361" y="704" type="curve" smooth="yes"/>
+      <point x="236" y="704"/>
+      <point x="168" y="625"/>
+      <point x="168" y="481" type="curve" smooth="yes"/>
+      <point x="168" y="198" type="line" smooth="yes"/>
+      <point x="168" y="113"/>
+      <point x="128" y="40"/>
+      <point x="69" y="17" type="curve"/>
     </contour>
     <contour>
-      <point x="97" y="433" type="line"/>
-      <point x="446" y="433" type="line"/>
-      <point x="446" y="450" type="line"/>
-      <point x="97" y="450" type="line"/>
+      <point x="81" y="418" type="line"/>
+      <point x="425" y="418" type="line"/>
+      <point x="425" y="435" type="line"/>
+      <point x="81" y="435" type="line"/>
     </contour>
     <contour>
-      <point x="97" y="273" type="line"/>
-      <point x="446" y="273" type="line"/>
-      <point x="446" y="290" type="line"/>
-      <point x="97" y="290" type="line"/>
+      <point x="81" y="261" type="line"/>
+      <point x="425" y="261" type="line"/>
+      <point x="425" y="278" type="line"/>
+      <point x="81" y="278" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
index 95731f37..f14af80c 100644
--- a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="599"/>
+  <advance width="580"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="184" y="0" type="line"/>
-      <point x="371" y="0"/>
-      <point x="515" y="132"/>
-      <point x="515" y="330" type="curve"/>
-      <point x="495" y="330" type="line"/>
-      <point x="495" y="144"/>
-      <point x="363" y="20"/>
-      <point x="194" y="20" type="curve"/>
+      <point x="154" y="0" type="line"/>
+      <point x="174" y="0" type="line" smooth="yes"/>
+      <point x="350" y="0"/>
+      <point x="469" y="129"/>
+      <point x="469" y="320" type="curve"/>
+      <point x="449" y="320" type="line"/>
+      <point x="449" y="139"/>
+      <point x="340" y="19"/>
+      <point x="174" y="19" type="curve"/>
+      <point x="174" y="694" type="line"/>
+      <point x="154" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="175" y="0" type="line"/>
-      <point x="195" y="0" type="line"/>
-      <point x="195" y="694" type="line"/>
-      <point x="175" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="87" y="429" type="line"/>
-      <point x="344" y="580" type="line"/>
-      <point x="335" y="595" type="line"/>
+      <point x="87" y="428" type="line"/>
+      <point x="371" y="586" type="line"/>
+      <point x="362" y="602" type="line"/>
       <point x="80" y="443" type="line"/>
     </contour>
     <contour>
-      <point x="99" y="287" type="line"/>
-      <point x="344" y="430" type="line"/>
-      <point x="335" y="445" type="line"/>
-      <point x="92" y="301" type="line"/>
+      <point x="103" y="270" type="line"/>
+      <point x="366" y="418" type="line"/>
+      <point x="356" y="433" type="line"/>
+      <point x="95" y="284" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/manat.glif b/src/Cantarell-Light.ufo/glyphs/manat.glif
index c92ed9c0..08d4b4e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="683"/>
+  <advance width="580"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="225" type="line" smooth="yes"/>
-      <point x="131" y="421"/>
-      <point x="215" y="551"/>
-      <point x="340" y="551" type="curve" smooth="yes"/>
-      <point x="468" y="551"/>
-      <point x="553" y="419"/>
-      <point x="553" y="222" type="curve" smooth="yes"/>
-      <point x="553" y="0" type="line"/>
-      <point x="573" y="0" type="line"/>
-      <point x="573" y="225" type="line" smooth="yes"/>
-      <point x="573" y="431"/>
-      <point x="481" y="569"/>
-      <point x="343" y="569" type="curve" smooth="yes"/>
-      <point x="203" y="569"/>
-      <point x="110" y="430"/>
-      <point x="110" y="222" type="curve" smooth="yes"/>
+      <point x="74" y="0" type="line"/>
+      <point x="95" y="0" type="line"/>
+      <point x="95" y="225" type="line" smooth="yes"/>
+      <point x="95" y="447"/>
+      <point x="162" y="563"/>
+      <point x="289" y="563" type="curve" smooth="yes"/>
+      <point x="419" y="563"/>
+      <point x="487" y="446"/>
+      <point x="487" y="222" type="curve" smooth="yes"/>
+      <point x="487" y="0" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="507" y="225" type="line" smooth="yes"/>
+      <point x="507" y="459"/>
+      <point x="433" y="581"/>
+      <point x="292" y="581" type="curve" smooth="yes"/>
+      <point x="149" y="581"/>
+      <point x="74" y="458"/>
+      <point x="74" y="222" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="333" y="100" type="line"/>
-      <point x="352" y="100" type="line"/>
-      <point x="352" y="694" type="line"/>
-      <point x="333" y="694" type="line"/>
+      <point x="282" y="100" type="line"/>
+      <point x="301" y="100" type="line"/>
+      <point x="301" y="694" type="line"/>
+      <point x="282" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/naira.glif b/src/Cantarell-Light.ufo/glyphs/naira.glif
index 45e536f2..f37bc3a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="831"/>
+  <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="661" y="423" type="line"/>
-      <point x="661" y="406" type="line"/>
-      <point x="746" y="406" type="line"/>
-      <point x="746" y="423" type="line"/>
+      <point x="455" y="435" type="line"/>
+      <point x="455" y="418" type="line"/>
+      <point x="549" y="418" type="line"/>
+      <point x="549" y="435" type="line"/>
     </contour>
     <contour>
-      <point x="661" y="293" type="line"/>
-      <point x="661" y="276" type="line"/>
-      <point x="746" y="276" type="line"/>
-      <point x="746" y="293" type="line"/>
+      <point x="455" y="278" type="line"/>
+      <point x="455" y="261" type="line"/>
+      <point x="549" y="261" type="line"/>
+      <point x="549" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="276" type="line"/>
-      <point x="169" y="293" type="line"/>
-      <point x="83" y="293" type="line"/>
-      <point x="83" y="276" type="line"/>
+      <point x="127" y="261" type="line"/>
+      <point x="127" y="278" type="line"/>
+      <point x="33" y="278" type="line"/>
+      <point x="33" y="261" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="406" type="line"/>
-      <point x="169" y="423" type="line"/>
-      <point x="83" y="423" type="line"/>
-      <point x="83" y="406" type="line"/>
+      <point x="127" y="418" type="line"/>
+      <point x="127" y="435" type="line"/>
+      <point x="33" y="435" type="line"/>
+      <point x="33" y="418" type="line"/>
+    </contour>
+    <contour>
+      <point x="118" y="0" type="line"/>
+      <point x="137" y="0" type="line"/>
+      <point x="137" y="674" type="line"/>
+      <point x="134" y="674" type="line"/>
+      <point x="440" y="0" type="line"/>
+      <point x="464" y="0" type="line"/>
+      <point x="464" y="694" type="line"/>
+      <point x="445" y="694" type="line"/>
+      <point x="445" y="20" type="line"/>
+      <point x="450" y="20" type="line"/>
+      <point x="144" y="694" type="line"/>
+      <point x="118" y="694" type="line"/>
     </contour>
-    <component base="N" xOffset="51"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/peseta.glif b/src/Cantarell-Light.ufo/glyphs/peseta.glif
index f5b96123..d3d8484b 100644
--- a/src/Cantarell-Light.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="722"/>
+  <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="543" y="473" type="line"/>
+      <point x="449" y="473" type="line"/>
+      <point x="449" y="456" type="line"/>
       <point x="543" y="456" type="line"/>
-      <point x="648" y="456" type="line"/>
-      <point x="648" y="473" type="line"/>
+      <point x="543" y="473" type="line"/>
+    </contour>
+    <contour>
+      <point x="141" y="456" type="line"/>
+      <point x="141" y="473" type="line"/>
+      <point x="45" y="473" type="line"/>
+      <point x="45" y="456" type="line"/>
+    </contour>
+    <contour>
+      <point x="130" y="0" type="line"/>
+      <point x="151" y="0" type="line"/>
+      <point x="151" y="268" type="line"/>
+      <point x="275" y="268" type="line" smooth="yes"/>
+      <point x="387" y="268"/>
+      <point x="462" y="354"/>
+      <point x="462" y="480" type="curve" smooth="yes"/>
+      <point x="462" y="607"/>
+      <point x="389" y="694"/>
+      <point x="280" y="694" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="169" y="456" type="line"/>
-      <point x="169" y="473" type="line"/>
-      <point x="74" y="473" type="line"/>
-      <point x="74" y="456" type="line"/>
+      <point x="151" y="286" type="line"/>
+      <point x="151" y="676" type="line"/>
+      <point x="275" y="676" type="line" smooth="yes"/>
+      <point x="374" y="676"/>
+      <point x="440" y="597"/>
+      <point x="440" y="475" type="curve" smooth="yes"/>
+      <point x="440" y="358"/>
+      <point x="380" y="286"/>
+      <point x="280" y="286" type="curve" smooth="yes"/>
     </contour>
-    <component base="P" xOffset="52"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/peso.glif b/src/Cantarell-Light.ufo/glyphs/peso.glif
index 1e523d8a..13d153c1 100644
--- a/src/Cantarell-Light.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="727"/>
+  <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="549" y="543" type="line"/>
-      <point x="549" y="526" type="line"/>
-      <point x="644" y="526" type="line"/>
-      <point x="644" y="543" type="line"/>
+      <point x="449" y="565" type="line"/>
+      <point x="449" y="548" type="line"/>
+      <point x="533" y="548" type="line"/>
+      <point x="533" y="565" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="526" type="line"/>
-      <point x="188" y="543" type="line"/>
-      <point x="83" y="543" type="line"/>
-      <point x="83" y="526" type="line"/>
+      <point x="141" y="548" type="line"/>
+      <point x="141" y="565" type="line"/>
+      <point x="45" y="565" type="line"/>
+      <point x="45" y="548" type="line"/>
     </contour>
     <contour>
-      <point x="549" y="404" type="line"/>
-      <point x="549" y="387" type="line"/>
-      <point x="644" y="387" type="line"/>
-      <point x="644" y="404" type="line"/>
+      <point x="130" y="0" type="line"/>
+      <point x="151" y="0" type="line"/>
+      <point x="151" y="268" type="line"/>
+      <point x="275" y="268" type="line" smooth="yes"/>
+      <point x="387" y="268"/>
+      <point x="462" y="354"/>
+      <point x="462" y="480" type="curve" smooth="yes"/>
+      <point x="462" y="607"/>
+      <point x="389" y="694"/>
+      <point x="280" y="694" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="387" type="line"/>
-      <point x="188" y="404" type="line"/>
-      <point x="83" y="404" type="line"/>
-      <point x="83" y="387" type="line"/>
+      <point x="151" y="286" type="line"/>
+      <point x="151" y="676" type="line"/>
+      <point x="275" y="676" type="line" smooth="yes"/>
+      <point x="374" y="676"/>
+      <point x="440" y="597"/>
+      <point x="440" y="475" type="curve" smooth="yes"/>
+      <point x="440" y="358"/>
+      <point x="380" y="286"/>
+      <point x="280" y="286" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="170" y="0" type="line"/>
-      <point x="191" y="0" type="line"/>
-      <point x="191" y="694" type="line"/>
-      <point x="170" y="694" type="line"/>
+      <point x="439" y="408" type="line"/>
+      <point x="439" y="391" type="line"/>
+      <point x="533" y="391" type="line"/>
+      <point x="533" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="185" y="268" type="line"/>
-      <point x="346" y="268" type="line" smooth="yes"/>
-      <point x="482" y="268"/>
-      <point x="572" y="353"/>
-      <point x="572" y="480" type="curve" smooth="yes"/>
-      <point x="572" y="608"/>
-      <point x="484" y="694"/>
-      <point x="352" y="694" type="curve" smooth="yes"/>
-      <point x="185" y="694" type="line"/>
-      <point x="185" y="676" type="line"/>
-      <point x="346" y="676" type="line" smooth="yes"/>
-      <point x="468" y="676"/>
-      <point x="550" y="597"/>
-      <point x="550" y="475" type="curve" smooth="yes"/>
-      <point x="550" y="358"/>
-      <point x="476" y="286"/>
-      <point x="352" y="286" type="curve" smooth="yes"/>
-      <point x="185" y="286" type="line"/>
+      <point x="141" y="391" type="line"/>
+      <point x="141" y="408" type="line"/>
+      <point x="45" y="408" type="line"/>
+      <point x="45" y="391" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ruble.glif b/src/Cantarell-Light.ufo/glyphs/ruble.glif
index 0c5b15cd..e6265028 100644
--- a/src/Cantarell-Light.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="696"/>
+  <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="204" y="0" type="line"/>
-      <point x="225" y="0" type="line"/>
-      <point x="225" y="694" type="line"/>
-      <point x="204" y="694" type="line"/>
+      <point x="148" y="0" type="line"/>
+      <point x="169" y="0" type="line"/>
+      <point x="169" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="122" type="line"/>
-      <point x="388" y="122" type="line"/>
-      <point x="388" y="139" type="line"/>
-      <point x="84" y="139" type="line"/>
+      <point x="65" y="122" type="line"/>
+      <point x="324" y="122" type="line"/>
+      <point x="324" y="139" type="line"/>
+      <point x="65" y="139" type="line"/>
     </contour>
     <contour>
-      <point x="84" y="268" type="line"/>
-      <point x="380" y="268" type="line" smooth="yes"/>
-      <point x="516" y="268"/>
-      <point x="606" y="353"/>
-      <point x="606" y="480" type="curve" smooth="yes"/>
-      <point x="606" y="608"/>
-      <point x="518" y="694"/>
-      <point x="386" y="694" type="curve" smooth="yes"/>
-      <point x="219" y="694" type="line"/>
-      <point x="219" y="676" type="line"/>
-      <point x="380" y="676" type="line" smooth="yes"/>
-      <point x="502" y="676"/>
-      <point x="584" y="597"/>
-      <point x="584" y="475" type="curve" smooth="yes"/>
-      <point x="584" y="358"/>
-      <point x="510" y="286"/>
-      <point x="386" y="286" type="curve" smooth="yes"/>
-      <point x="84" y="286" type="line"/>
+      <point x="65" y="279" type="line"/>
+      <point x="315" y="279" type="line" smooth="yes"/>
+      <point x="429" y="279"/>
+      <point x="507" y="363"/>
+      <point x="507" y="485" type="curve" smooth="yes"/>
+      <point x="507" y="609"/>
+      <point x="431" y="694"/>
+      <point x="320" y="694" type="curve" smooth="yes"/>
+      <point x="162" y="694" type="line"/>
+      <point x="162" y="676" type="line"/>
+      <point x="315" y="676" type="line" smooth="yes"/>
+      <point x="416" y="676"/>
+      <point x="485" y="597"/>
+      <point x="485" y="480" type="curve" smooth="yes"/>
+      <point x="485" y="367"/>
+      <point x="422" y="297"/>
+      <point x="320" y="297" type="curve" smooth="yes"/>
+      <point x="65" y="297" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif 
b/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
index 63d6ef19..5534760b 100644
--- a/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="643"/>
+  <advance width="580"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="90" y="304" type="line"/>
-      <point x="247" y="304" type="line" smooth="yes"/>
-      <point x="401" y="304"/>
-      <point x="485" y="378"/>
-      <point x="485" y="502" type="curve" smooth="yes"/>
-      <point x="485" y="623"/>
-      <point x="403" y="694"/>
-      <point x="251" y="694" type="curve" smooth="yes"/>
-      <point x="90" y="694" type="line"/>
-      <point x="90" y="676" type="line"/>
-      <point x="247" y="676" type="line" smooth="yes"/>
-      <point x="389" y="676"/>
-      <point x="463" y="612"/>
-      <point x="463" y="499" type="curve" smooth="yes"/>
-      <point x="463" y="387"/>
-      <point x="389" y="321"/>
-      <point x="253" y="321" type="curve" smooth="yes"/>
-      <point x="90" y="321" type="line"/>
+      <point x="59" y="302" type="line"/>
+      <point x="216" y="302" type="line" smooth="yes"/>
+      <point x="368" y="302"/>
+      <point x="454" y="374"/>
+      <point x="454" y="502" type="curve" smooth="yes"/>
+      <point x="454" y="625"/>
+      <point x="370" y="694"/>
+      <point x="220" y="694" type="curve" smooth="yes"/>
+      <point x="59" y="694" type="line"/>
+      <point x="59" y="676" type="line"/>
+      <point x="216" y="676" type="line" smooth="yes"/>
+      <point x="356" y="676"/>
+      <point x="432" y="614"/>
+      <point x="432" y="499" type="curve" smooth="yes"/>
+      <point x="432" y="384"/>
+      <point x="357" y="319"/>
+      <point x="222" y="319" type="curve" smooth="yes"/>
+      <point x="59" y="319" type="line"/>
     </contour>
     <contour>
-      <point x="491" y="0" type="line"/>
-      <point x="517" y="0" type="line"/>
-      <point x="332" y="317" type="line"/>
-      <point x="310" y="317" type="line"/>
+      <point x="470" y="0" type="line"/>
+      <point x="496" y="0" type="line"/>
+      <point x="281" y="315" type="line"/>
+      <point x="259" y="315" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="488" type="line"/>
-      <point x="562" y="488" type="line"/>
-      <point x="562" y="505" type="line"/>
-      <point x="90" y="505" type="line"/>
+      <point x="59" y="489" type="line"/>
+      <point x="531" y="489" type="line"/>
+      <point x="531" y="505" type="line"/>
+      <point x="59" y="505" type="line"/>
     </contour>
     <contour>
-      <point x="90" y="677" type="line"/>
-      <point x="562" y="677" type="line"/>
-      <point x="562" y="694" type="line"/>
-      <point x="90" y="694" type="line"/>
+      <point x="59" y="677" type="line"/>
+      <point x="531" y="677" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="59" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sterling.glif b/src/Cantarell-Light.ufo/glyphs/sterling.glif
index bb181fa0..0c4cb353 100644
--- a/src/Cantarell-Light.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="607"/>
+  <advance width="580"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="78" y="0" type="line"/>
-      <point x="535" y="0" type="line"/>
-      <point x="535" y="17" type="line"/>
-      <point x="112" y="17" type="line"/>
-      <point x="160" y="38"/>
-      <point x="189" y="107"/>
-      <point x="189" y="201" type="curve" smooth="yes"/>
-      <point x="189" y="484" type="line" smooth="yes"/>
-      <point x="189" y="605"/>
-      <point x="262" y="685"/>
-      <point x="373" y="685" type="curve" smooth="yes"/>
-      <point x="405" y="685"/>
-      <point x="448" y="679"/>
-      <point x="493" y="665" type="curve"/>
-      <point x="499" y="681" type="line"/>
-      <point x="461" y="695"/>
-      <point x="414" y="704"/>
-      <point x="376" y="704" type="curve" smooth="yes"/>
-      <point x="251" y="704"/>
-      <point x="169" y="615"/>
-      <point x="169" y="481" type="curve" smooth="yes"/>
-      <point x="169" y="198" type="line" smooth="yes"/>
-      <point x="169" y="106"/>
-      <point x="135" y="38"/>
-      <point x="78" y="17" type="curve"/>
+      <point x="69" y="0" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="516" y="17" type="line"/>
+      <point x="103" y="17" type="line"/>
+      <point x="153" y="40"/>
+      <point x="188" y="116"/>
+      <point x="188" y="201" type="curve" smooth="yes"/>
+      <point x="188" y="484" type="line" smooth="yes"/>
+      <point x="188" y="614"/>
+      <point x="248" y="685"/>
+      <point x="358" y="685" type="curve" smooth="yes"/>
+      <point x="393" y="685"/>
+      <point x="434" y="678"/>
+      <point x="475" y="665" type="curve"/>
+      <point x="481" y="681" type="line"/>
+      <point x="441" y="696"/>
+      <point x="400" y="704"/>
+      <point x="361" y="704" type="curve" smooth="yes"/>
+      <point x="236" y="704"/>
+      <point x="168" y="625"/>
+      <point x="168" y="481" type="curve" smooth="yes"/>
+      <point x="168" y="198" type="line" smooth="yes"/>
+      <point x="168" y="113"/>
+      <point x="128" y="40"/>
+      <point x="69" y="17" type="curve"/>
     </contour>
     <contour>
-      <point x="86" y="340" type="line"/>
-      <point x="435" y="340" type="line"/>
-      <point x="435" y="357" type="line"/>
-      <point x="86" y="357" type="line"/>
+      <point x="77" y="340" type="line"/>
+      <point x="418" y="340" type="line"/>
+      <point x="418" y="357" type="line"/>
+      <point x="77" y="357" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tenge.glif b/src/Cantarell-Light.ufo/glyphs/tenge.glif
index a067c2d7..61b88f06 100644
--- a/src/Cantarell-Light.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tenge.glif
@@ -1,7 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tenge" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="300" y="520" type="line"/>
+      <point x="527" y="520" type="line"/>
+      <point x="527" y="537" type="line"/>
+      <point x="55" y="537" type="line"/>
+      <point x="55" y="520" type="line"/>
+      <point x="281" y="520" type="line"/>
+    </contour>
+    <contour>
+      <point x="54" y="677" type="line"/>
+      <point x="526" y="677" type="line"/>
+      <point x="526" y="694" type="line"/>
+      <point x="54" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tugrik.glif b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
index f5d41ab5..9ddd4c27 100644
--- a/src/Cantarell-Light.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
@@ -1,7 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tugrik" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="85" y="676" type="line"/>
+      <point x="280" y="676" type="line"/>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="301" y="676" type="line"/>
+      <point x="496" y="676" type="line"/>
+      <point x="496" y="694" type="line"/>
+      <point x="85" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="143" y="339" type="line"/>
+      <point x="442" y="476" type="line"/>
+      <point x="434" y="492" type="line"/>
+      <point x="135" y="354" type="line"/>
+    </contour>
+    <contour>
+      <point x="157" y="190" type="line"/>
+      <point x="436" y="317" type="line"/>
+      <point x="428" y="333" type="line"/>
+      <point x="149" y="205" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/won.glif b/src/Cantarell-Light.ufo/glyphs/won.glif
index 0362b973..8bd6476d 100644
--- a/src/Cantarell-Light.ufo/glyphs/won.glif
+++ b/src/Cantarell-Light.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1124"/>
+  <advance width="580"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="95" y="274" type="line"/>
-      <point x="257" y="274" type="line"/>
-      <point x="257" y="291" type="line"/>
-      <point x="95" y="291" type="line"/>
+      <point x="150" y="0" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="295" y="662" type="line"/>
+      <point x="285" y="662" type="line"/>
+      <point x="417" y="0" type="line"/>
+      <point x="432" y="0" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="532" y="694" type="line"/>
+      <point x="422" y="32" type="line"/>
+      <point x="429" y="32" type="line"/>
+      <point x="298" y="683" type="line"/>
+      <point x="283" y="683" type="line"/>
+      <point x="154" y="32" type="line"/>
+      <point x="161" y="32" type="line"/>
+      <point x="49" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="414" type="line"/>
-      <point x="584" y="414" type="line"/>
-      <point x="584" y="431" type="line"/>
-      <point x="95" y="431" type="line"/>
+      <point x="5" y="418" type="line"/>
+      <point x="575" y="418" type="line"/>
+      <point x="575" y="433" type="line"/>
+      <point x="5" y="433" type="line"/>
     </contour>
     <contour>
-      <point x="1035" y="274" type="line"/>
-      <point x="1035" y="291" type="line"/>
-      <point x="883" y="291" type="line"/>
-      <point x="883" y="274" type="line"/>
+      <point x="5" y="261" type="line"/>
+      <point x="112" y="261" type="line"/>
+      <point x="112" y="278" type="line"/>
+      <point x="5" y="278" type="line"/>
     </contour>
     <contour>
-      <point x="1035" y="414" type="line"/>
-      <point x="1035" y="431" type="line"/>
-      <point x="557" y="431" type="line"/>
-      <point x="557" y="414" type="line"/>
+      <point x="468" y="261" type="line"/>
+      <point x="575" y="261" type="line"/>
+      <point x="575" y="278" type="line"/>
+      <point x="468" y="278" type="line"/>
     </contour>
-    <component base="W" xOffset="60"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yen.glif b/src/Cantarell-Light.ufo/glyphs/yen.glif
index 6dab97fa..22155dcb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="643"/>
+  <advance width="580"/>
   <unicode hex="00A5"/>
   <outline>
+    <contour>
+      <point x="280" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="301" y="333" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="475" y="694" type="line"/>
+      <point x="288" y="344" type="line"/>
+      <point x="296" y="344" type="line"/>
+      <point x="108" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="280" y="333" type="line"/>
+    </contour>
     <contour>
       <point x="112" y="170" type="line"/>
-      <point x="532" y="170" type="line"/>
-      <point x="532" y="187" type="line"/>
+      <point x="470" y="170" type="line"/>
+      <point x="470" y="187" type="line"/>
       <point x="112" y="187" type="line"/>
     </contour>
     <contour>
       <point x="112" y="327" type="line"/>
-      <point x="532" y="327" type="line"/>
-      <point x="532" y="344" type="line"/>
+      <point x="470" y="327" type="line"/>
+      <point x="470" y="344" type="line"/>
       <point x="112" y="344" type="line"/>
     </contour>
-    <contour>
-      <point x="311" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="332" y="333" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="541" y="694" type="line"/>
-      <point x="319" y="344" type="line"/>
-      <point x="327" y="344" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="78" y="694" type="line"/>
-      <point x="311" y="333" type="line"/>
-    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index bf176cc7..f9348720 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -2133,6 +2133,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2143,11 +2144,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -3565,9 +3565,6 @@
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
   </dict>
 </plist>
diff --git a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif 
b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
index 72774cc5..1f62a8a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/_currencyvstem.glif
@@ -3,10 +3,10 @@
   <advance width="698"/>
   <outline>
     <contour>
-      <point x="382" y="646" type="line"/>
-      <point x="452" y="646" type="line"/>
-      <point x="452" y="840" type="line"/>
-      <point x="382" y="840" type="line"/>
+      <point x="382" y="658" type="line"/>
+      <point x="452" y="658" type="line"/>
+      <point x="452" y="828" type="line"/>
+      <point x="382" y="828" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cedi.glif b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
index 424daa98..2aa45bd9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
@@ -1,20 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedi" format="2">
-  <advance width="713"/>
+  <advance width="580"/>
   <unicode hex="20B5"/>
   <outline>
-    <component base="C" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="-5"/>
-    <component base="_currencyvstem" xOffset="-5" yOffset="-800"/>
+    <contour>
+      <point x="352" y="-10" type="curve" smooth="yes"/>
+      <point x="411" y="-10"/>
+      <point x="473" y="5"/>
+      <point x="529" y="34" type="curve"/>
+      <point x="510" y="95" type="line"/>
+      <point x="468" y="75"/>
+      <point x="415" y="63"/>
+      <point x="371" y="63" type="curve" smooth="yes"/>
+      <point x="231" y="63"/>
+      <point x="139" y="181"/>
+      <point x="139" y="358" type="curve" smooth="yes"/>
+      <point x="139" y="527"/>
+      <point x="223" y="630"/>
+      <point x="362" y="630" type="curve" smooth="yes"/>
+      <point x="411" y="630"/>
+      <point x="465" y="618"/>
+      <point x="509" y="598" type="curve"/>
+      <point x="533" y="660" type="line"/>
+      <point x="487" y="687"/>
+      <point x="425" y="703"/>
+      <point x="366" y="703" type="curve" smooth="yes"/>
+      <point x="180" y="703"/>
+      <point x="54" y="557"/>
+      <point x="54" y="339" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="174" y="-10"/>
+    </contour>
+    <contour>
+      <point x="312" y="658" type="line"/>
+      <point x="383" y="658" type="line"/>
+      <point x="383" y="818" type="line"/>
+      <point x="312" y="818" type="line"/>
+    </contour>
+    <contour>
+      <point x="312" y="-120" type="line"/>
+      <point x="383" y="-120" type="line"/>
+      <point x="383" y="28" type="line"/>
+      <point x="312" y="28" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cent.glif b/src/Cantarell-Regular.ufo/glyphs/cent.glif
index c5623560..10d6c660 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cent.glif
@@ -3,9 +3,9 @@
   <advance width="580"/>
   <unicode hex="00A2"/>
   <outline>
-    <component base="c" xOffset="35"/>
-    <component base="_currencyvstem" xOffset="-105" yOffset="-211"/>
-    <component base="_currencyvstem" xOffset="-102" yOffset="-778"/>
+    <component base="c" xOffset="52"/>
+    <component base="_currencyvstem" xOffset="-88" yOffset="-211"/>
+    <component base="_currencyvstem" xOffset="-85" yOffset="-778"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
index 9f0d5826..c957a94b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
@@ -1,32 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colonsign" format="2">
-  <advance width="714"/>
+  <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="478" y="694" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="559" y="824" type="line"/>
-      <point x="499" y="824" type="line"/>
+      <point x="402" y="684" type="line"/>
+      <point x="461" y="684" type="line"/>
+      <point x="482" y="818" type="line"/>
+      <point x="423" y="818" type="line"/>
     </contour>
     <contour>
-      <point x="263" y="-140" type="line"/>
-      <point x="323" y="-140" type="line"/>
-      <point x="350" y="26" type="line"/>
-      <point x="290" y="26" type="line"/>
+      <point x="210" y="-120" type="line"/>
+      <point x="269" y="-120" type="line"/>
+      <point x="294" y="26" type="line"/>
+      <point x="235" y="26" type="line"/>
     </contour>
     <contour>
-      <point x="368" y="694" type="line"/>
-      <point x="428" y="694" type="line"/>
-      <point x="449" y="824" type="line"/>
-      <point x="389" y="824" type="line"/>
+      <point x="299" y="684" type="line"/>
+      <point x="358" y="684" type="line"/>
+      <point x="379" y="818" type="line"/>
+      <point x="320" y="818" type="line"/>
     </contour>
     <contour>
-      <point x="374" y="-140" type="line"/>
-      <point x="434" y="-140" type="line"/>
-      <point x="461" y="26" type="line"/>
-      <point x="401" y="26" type="line"/>
+      <point x="314" y="-120" type="line"/>
+      <point x="373" y="-120" type="line"/>
+      <point x="398" y="26" type="line"/>
+      <point x="339" y="26" type="line"/>
+    </contour>
+    <contour>
+      <point x="353" y="-10" type="curve" smooth="yes"/>
+      <point x="413" y="-10"/>
+      <point x="474" y="5"/>
+      <point x="530" y="34" type="curve"/>
+      <point x="511" y="95" type="line"/>
+      <point x="469" y="75"/>
+      <point x="416" y="63"/>
+      <point x="372" y="63" type="curve" smooth="yes"/>
+      <point x="232" y="63"/>
+      <point x="140" y="181"/>
+      <point x="140" y="358" type="curve" smooth="yes"/>
+      <point x="140" y="527"/>
+      <point x="224" y="630"/>
+      <point x="363" y="630" type="curve" smooth="yes"/>
+      <point x="411" y="630"/>
+      <point x="466" y="618"/>
+      <point x="510" y="598" type="curve"/>
+      <point x="534" y="660" type="line"/>
+      <point x="488" y="687"/>
+      <point x="426" y="703"/>
+      <point x="368" y="703" type="curve" smooth="yes"/>
+      <point x="181" y="703"/>
+      <point x="55" y="557"/>
+      <point x="55" y="339" type="curve" smooth="yes"/>
+      <point x="55" y="130"/>
+      <point x="175" y="-10"/>
     </contour>
-    <component base="C" xOffset="20"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/currency.glif b/src/Cantarell-Regular.ufo/glyphs/currency.glif
index 36928f25..b38812ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/currency.glif
@@ -1,59 +1,65 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="currency" format="2">
-  <advance width="662"/>
+  <advance width="580"/>
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <point x="326" y="131" type="curve" smooth="yes"/>
-      <point x="450" y="131"/>
-      <point x="532" y="215"/>
-      <point x="532" y="342" type="curve" smooth="yes"/>
-      <point x="532" y="461"/>
-      <point x="454" y="540"/>
-      <point x="336" y="540" type="curve" smooth="yes"/>
-      <point x="212" y="540"/>
-      <point x="130" y="456"/>
-      <point x="130" y="331" type="curve" smooth="yes"/>
-      <point x="130" y="211"/>
-      <point x="208" y="131"/>
+      <point x="286" y="131" type="curve" smooth="yes"/>
+      <point x="410" y="131"/>
+      <point x="492" y="215"/>
+      <point x="492" y="342" type="curve" smooth="yes"/>
+      <point x="492" y="461"/>
+      <point x="414" y="540"/>
+      <point x="296" y="540" type="curve" smooth="yes"/>
+      <point x="172" y="540"/>
+      <point x="90" y="456"/>
+      <point x="90" y="331" type="curve" smooth="yes"/>
+      <point x="90" y="211"/>
+      <point x="168" y="131"/>
     </contour>
     <contour>
-      <point x="135" y="90" type="line"/>
-      <point x="227" y="181" type="line"/>
-      <point x="186" y="222" type="line"/>
-      <point x="94" y="131" type="line"/>
+      <point x="95" y="90" type="line"/>
+      <point x="187" y="181" type="line"/>
+      <point x="146" y="222" type="line"/>
+      <point x="54" y="131" type="line"/>
     </contour>
     <contour>
-      <point x="527" y="90" type="line"/>
-      <point x="567" y="131" type="line"/>
-      <point x="475" y="221" type="line"/>
-      <point x="435" y="181" type="line"/>
+      <point x="487" y="90" type="line"/>
+      <point x="527" y="131" type="line"/>
+      <point x="435" y="221" type="line"/>
+      <point x="395" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="336" y="204" type="curve" smooth="yes"/>
-      <point x="260" y="204"/>
-      <point x="210" y="259"/>
-      <point x="210" y="341" type="curve" smooth="yes"/>
-      <point x="210" y="417"/>
-      <point x="256" y="467"/>
-      <point x="326" y="467" type="curve" smooth="yes"/>
-      <point x="402" y="467"/>
-      <point x="452" y="413"/>
-      <point x="452" y="332" type="curve" smooth="yes"/>
-      <point x="452" y="255"/>
-      <point x="406" y="204"/>
+      <point x="296" y="204" type="curve" smooth="yes"/>
+      <point x="220" y="204"/>
+      <point x="170" y="259"/>
+      <point x="170" y="341" type="curve" smooth="yes"/>
+      <point x="170" y="417"/>
+      <point x="216" y="467"/>
+      <point x="286" y="467" type="curve" smooth="yes"/>
+      <point x="362" y="467"/>
+      <point x="412" y="413"/>
+      <point x="412" y="332" type="curve" smooth="yes"/>
+      <point x="412" y="255"/>
+      <point x="366" y="204"/>
     </contour>
     <contour>
-      <point x="185" y="448" type="line"/>
-      <point x="227" y="488" type="line"/>
-      <point x="135" y="580" type="line"/>
-      <point x="94" y="539" type="line"/>
+      <point x="145" y="448" type="line"/>
+      <point x="187" y="488" type="line"/>
+      <point x="95" y="580" type="line"/>
+      <point x="54" y="539" type="line"/>
     </contour>
     <contour>
-      <point x="475" y="448" type="line"/>
-      <point x="567" y="539" type="line"/>
-      <point x="526" y="580" type="line"/>
-      <point x="434" y="488" type="line"/>
+      <point x="435" y="448" type="line"/>
+      <point x="527" y="539" type="line"/>
+      <point x="486" y="580" type="line"/>
+      <point x="394" y="488" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dong.glif b/src/Cantarell-Regular.ufo/glyphs/dong.glif
index 3ada93e7..e2e23d5a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dong.glif
@@ -1,14 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dong" format="2">
-  <advance width="670"/>
+  <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
     <contour>
-      <point x="119" y="-140" type="line"/>
-      <point x="541" y="-140" type="line"/>
-      <point x="541" y="-80" type="line"/>
-      <point x="119" y="-80" type="line"/>
+      <point x="86" y="-140" type="line"/>
+      <point x="500" y="-140" type="line"/>
+      <point x="500" y="-80" type="line"/>
+      <point x="86" y="-80" type="line"/>
+    </contour>
+    <contour>
+      <point x="426" y="0" type="line"/>
+      <point x="481" y="0" type="line"/>
+      <point x="481" y="739" type="line"/>
+      <point x="401" y="739" type="line"/>
+      <point x="401" y="56" type="line"/>
+    </contour>
+    <contour>
+      <point x="264" y="-10" type="curve" smooth="yes"/>
+      <point x="344" y="-10"/>
+      <point x="405" y="30"/>
+      <point x="441" y="96" type="curve"/>
+      <point x="413" y="132" type="line"/>
+      <point x="387" y="87"/>
+      <point x="343" y="60"/>
+      <point x="288" y="60" type="curve" smooth="yes"/>
+      <point x="195" y="60"/>
+      <point x="135" y="136"/>
+      <point x="135" y="246" type="curve" smooth="yes"/>
+      <point x="135" y="352"/>
+      <point x="190" y="422"/>
+      <point x="279" y="422" type="curve" smooth="yes"/>
+      <point x="338" y="422"/>
+      <point x="385" y="394"/>
+      <point x="412" y="346" type="curve"/>
+      <point x="448" y="390" type="line"/>
+      <point x="414" y="455"/>
+      <point x="354" y="492"/>
+      <point x="275" y="492" type="curve" smooth="yes"/>
+      <point x="143" y="492"/>
+      <point x="55" y="390"/>
+      <point x="55" y="237" type="curve" smooth="yes"/>
+      <point x="55" y="90"/>
+      <point x="139" y="-10"/>
+    </contour>
+    <contour>
+      <point x="271" y="569" type="line"/>
+      <point x="543" y="569" type="line"/>
+      <point x="543" y="627" type="line"/>
+      <point x="271" y="627" type="line"/>
     </contour>
-    <component base="dcroat" xOffset="36"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/euro.glif b/src/Cantarell-Regular.ufo/glyphs/euro.glif
index cc6d202c..9b1e5685 100644
--- a/src/Cantarell-Regular.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/euro.glif
@@ -5,43 +5,43 @@
   <outline>
     <contour>
       <point x="16" y="404" type="line"/>
-      <point x="509" y="404" type="line"/>
-      <point x="509" y="464" type="line"/>
-      <point x="16" y="464" type="line"/>
+      <point x="505" y="404" type="line"/>
+      <point x="505" y="471" type="line"/>
+      <point x="16" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="16" y="244" type="line"/>
-      <point x="489" y="244" type="line"/>
-      <point x="489" y="304" type="line"/>
-      <point x="16" y="304" type="line"/>
+      <point x="16" y="227" type="line"/>
+      <point x="486" y="227" type="line"/>
+      <point x="486" y="294" type="line"/>
+      <point x="16" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="384" y="-10" type="curve" smooth="yes"/>
-      <point x="444" y="-10"/>
-      <point x="509" y="5"/>
-      <point x="566" y="34" type="curve"/>
-      <point x="547" y="95" type="line"/>
-      <point x="504" y="75"/>
-      <point x="449" y="63"/>
-      <point x="404" y="63" type="curve" smooth="yes"/>
-      <point x="259" y="63"/>
-      <point x="165" y="182"/>
-      <point x="165" y="358" type="curve" smooth="yes"/>
-      <point x="165" y="527"/>
-      <point x="251" y="630"/>
-      <point x="395" y="630" type="curve" smooth="yes"/>
-      <point x="444" y="630"/>
-      <point x="501" y="618"/>
-      <point x="546" y="598" type="curve"/>
-      <point x="570" y="660" type="line"/>
-      <point x="523" y="687"/>
-      <point x="460" y="703"/>
-      <point x="399" y="703" type="curve" smooth="yes"/>
-      <point x="209" y="703"/>
-      <point x="80" y="557"/>
-      <point x="80" y="339" type="curve" smooth="yes"/>
-      <point x="80" y="131"/>
-      <point x="203" y="-10"/>
+      <point x="382" y="-10" type="curve" smooth="yes"/>
+      <point x="442" y="-10"/>
+      <point x="505" y="5"/>
+      <point x="561" y="34" type="curve"/>
+      <point x="542" y="95" type="line"/>
+      <point x="500" y="75"/>
+      <point x="446" y="63"/>
+      <point x="402" y="63" type="curve" smooth="yes"/>
+      <point x="260" y="63"/>
+      <point x="168" y="183"/>
+      <point x="168" y="358" type="curve" smooth="yes"/>
+      <point x="168" y="527"/>
+      <point x="253" y="630"/>
+      <point x="393" y="630" type="curve" smooth="yes"/>
+      <point x="441" y="630"/>
+      <point x="497" y="618"/>
+      <point x="541" y="598" type="curve"/>
+      <point x="565" y="660" type="line"/>
+      <point x="519" y="687"/>
+      <point x="456" y="703"/>
+      <point x="397" y="703" type="curve" smooth="yes"/>
+      <point x="211" y="703"/>
+      <point x="83" y="557"/>
+      <point x="83" y="339" type="curve" smooth="yes"/>
+      <point x="83" y="131"/>
+      <point x="205" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/florin.glif b/src/Cantarell-Regular.ufo/glyphs/florin.glif
index 0e5ca852..87be3ab6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/florin.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="florin" format="2">
-  <advance width="483"/>
+  <advance width="580"/>
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="587" type="line" smooth="yes"/>
-      <point x="228" y="649"/>
-      <point x="257" y="681"/>
-      <point x="312" y="681" type="curve" smooth="yes"/>
-      <point x="338" y="681"/>
-      <point x="371" y="674"/>
-      <point x="396" y="662" type="curve"/>
-      <point x="415" y="726" type="line"/>
-      <point x="384" y="741"/>
-      <point x="352" y="749"/>
-      <point x="318" y="749" type="curve" smooth="yes"/>
-      <point x="216" y="749"/>
-      <point x="148" y="680"/>
-      <point x="148" y="577" type="curve" smooth="yes"/>
+      <point x="197" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="277" y="587" type="line" smooth="yes"/>
+      <point x="277" y="649"/>
+      <point x="306" y="681"/>
+      <point x="361" y="681" type="curve" smooth="yes"/>
+      <point x="387" y="681"/>
+      <point x="420" y="674"/>
+      <point x="445" y="662" type="curve"/>
+      <point x="464" y="726" type="line"/>
+      <point x="433" y="741"/>
+      <point x="401" y="749"/>
+      <point x="367" y="749" type="curve" smooth="yes"/>
+      <point x="265" y="749"/>
+      <point x="197" y="680"/>
+      <point x="197" y="577" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="76" y="415" type="line"/>
-      <point x="378" y="415" type="line"/>
-      <point x="378" y="482" type="line"/>
-      <point x="76" y="482" type="line"/>
+      <point x="125" y="415" type="line"/>
+      <point x="427" y="415" type="line"/>
+      <point x="427" y="482" type="line"/>
+      <point x="125" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="105" y="-227" type="line"/>
-      <point x="179" y="-194"/>
-      <point x="228" y="-113"/>
-      <point x="228" y="-23" type="curve" smooth="yes"/>
-      <point x="228" y="0" type="line"/>
-      <point x="148" y="0" type="line"/>
-      <point x="148" y="-35" type="line" smooth="yes"/>
-      <point x="148" y="-98"/>
-      <point x="120" y="-155"/>
-      <point x="78" y="-179" type="curve"/>
+      <point x="154" y="-227" type="line"/>
+      <point x="228" y="-194"/>
+      <point x="277" y="-113"/>
+      <point x="277" y="-23" type="curve" smooth="yes"/>
+      <point x="277" y="0" type="line"/>
+      <point x="197" y="0" type="line"/>
+      <point x="197" y="-35" type="line" smooth="yes"/>
+      <point x="197" y="-98"/>
+      <point x="169" y="-155"/>
+      <point x="127" y="-179" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/franc.glif b/src/Cantarell-Regular.ufo/glyphs/franc.glif
index c7e2fd05..3fef7d89 100644
--- a/src/Cantarell-Regular.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/franc.glif
@@ -1,18 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="franc" format="2">
-  <advance width="666"/>
+  <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <component base="F" xOffset="49"/>
-    <component base="strokeshortcomb.case" xOffset="-1" yOffset="-131"/>
+    <contour>
+      <point x="53" y="147" type="line"/>
+      <point x="348" y="147" type="line"/>
+      <point x="348" y="212" type="line"/>
+      <point x="53" y="212" type="line"/>
+    </contour>
+    <contour>
+      <point x="131" y="0" type="line"/>
+      <point x="214" y="0" type="line"/>
+      <point x="214" y="322" type="line"/>
+      <point x="492" y="322" type="line"/>
+      <point x="492" y="394" type="line"/>
+      <point x="214" y="394" type="line"/>
+      <point x="214" y="622" type="line"/>
+      <point x="518" y="622" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="131" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>0</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guarani.glif b/src/Cantarell-Regular.ufo/glyphs/guarani.glif
index cc89016e..ad2ecdb2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guarani.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guarani.glif
@@ -1,20 +1,58 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guarani" format="2">
-  <advance width="780"/>
+  <advance width="580"/>
   <unicode hex="20B2"/>
   <outline>
-    <component base="G" xOffset="19"/>
-    <component base="_currencyvstem" xOffset="15" yOffset="-800"/>
-    <component base="_currencyvstem" xOffset="3"/>
+    <contour>
+      <point x="326" y="-9" type="curve" smooth="yes"/>
+      <point x="410" y="-9"/>
+      <point x="486" y="19"/>
+      <point x="547" y="74" type="curve"/>
+      <point x="547" y="368" type="line"/>
+      <point x="302" y="368" type="line"/>
+      <point x="302" y="296" type="line"/>
+      <point x="465" y="296" type="line"/>
+      <point x="465" y="71" type="line"/>
+      <point x="483" y="112" type="line"/>
+      <point x="440" y="81"/>
+      <point x="389" y="64"/>
+      <point x="338" y="64" type="curve" smooth="yes"/>
+      <point x="201" y="64"/>
+      <point x="111" y="180"/>
+      <point x="111" y="357" type="curve" smooth="yes"/>
+      <point x="111" y="530"/>
+      <point x="194" y="630"/>
+      <point x="334" y="630" type="curve" smooth="yes"/>
+      <point x="386" y="630"/>
+      <point x="450" y="616"/>
+      <point x="501" y="593" type="curve"/>
+      <point x="524" y="657" type="line"/>
+      <point x="472" y="687"/>
+      <point x="407" y="703"/>
+      <point x="343" y="703" type="curve" smooth="yes"/>
+      <point x="153" y="703"/>
+      <point x="26" y="559"/>
+      <point x="26" y="342" type="curve" smooth="yes"/>
+      <point x="26" y="130"/>
+      <point x="147" y="-9"/>
+    </contour>
+    <contour>
+      <point x="299" y="-120" type="line"/>
+      <point x="371" y="-120" type="line"/>
+      <point x="371" y="28" type="line"/>
+      <point x="299" y="28" type="line"/>
+    </contour>
+    <contour>
+      <point x="289" y="658" type="line"/>
+      <point x="360" y="658" type="line"/>
+      <point x="360" y="818" type="line"/>
+      <point x="289" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.componentsAlignment</key>
-      <array>
-        <integer>-1</integer>
-        <integer>-1</integer>
-        <integer>-1</integer>
-      </array>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
index b02df3ed..901f1483 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
@@ -1,7 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hryvnia" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B4"/>
   <outline>
+    <contour>
+      <point x="212" y="264" type="curve"/>
+      <point x="106" y="264" type="line"/>
+      <point x="95" y="243"/>
+      <point x="91" y="214"/>
+      <point x="91" y="187" type="curve" smooth="yes"/>
+      <point x="91" y="66"/>
+      <point x="177" y="-10"/>
+      <point x="313" y="-10" type="curve" smooth="yes"/>
+      <point x="377" y="-10"/>
+      <point x="439" y="9"/>
+      <point x="510" y="46" type="curve"/>
+      <point x="488" y="107" type="line"/>
+      <point x="423" y="77"/>
+      <point x="368" y="64"/>
+      <point x="321" y="64" type="curve" smooth="yes"/>
+      <point x="236" y="64"/>
+      <point x="177" y="114"/>
+      <point x="177" y="187" type="curve" smooth="yes"/>
+      <point x="177" y="216"/>
+      <point x="188" y="243"/>
+    </contour>
+    <contour>
+      <point x="20" y="404" type="line"/>
+      <point x="560" y="404" type="line"/>
+      <point x="560" y="471" type="line"/>
+      <point x="20" y="471" type="line"/>
+    </contour>
+    <contour>
+      <point x="20" y="227" type="line"/>
+      <point x="560" y="227" type="line"/>
+      <point x="560" y="294" type="line"/>
+      <point x="20" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="384" y="443" type="curve"/>
+      <point x="480" y="443" type="line"/>
+      <point x="488" y="462"/>
+      <point x="492" y="493"/>
+      <point x="492" y="521" type="curve" smooth="yes"/>
+      <point x="492" y="639"/>
+      <point x="416" y="703"/>
+      <point x="281" y="703" type="curve" smooth="yes"/>
+      <point x="224" y="703"/>
+      <point x="157" y="689"/>
+      <point x="104" y="663" type="curve"/>
+      <point x="128" y="598" type="line"/>
+      <point x="171" y="620"/>
+      <point x="225" y="631"/>
+      <point x="269" y="631" type="curve" smooth="yes"/>
+      <point x="357" y="631"/>
+      <point x="407" y="592"/>
+      <point x="407" y="518" type="curve" smooth="yes"/>
+      <point x="407" y="492"/>
+      <point x="399" y="460"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kip.glif b/src/Cantarell-Regular.ufo/glyphs/kip.glif
index b6a2a600..31d85cb4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kip.glif
@@ -1,28 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kip" format="2">
-  <advance width="712"/>
+  <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
     <contour>
-      <point x="72" y="329" type="line"/>
-      <point x="604" y="329" type="line"/>
-      <point x="604" y="389" type="line"/>
-      <point x="72" y="389" type="line"/>
+      <point x="43" y="329" type="line"/>
+      <point x="512" y="329" type="line"/>
+      <point x="512" y="389" type="line"/>
+      <point x="43" y="389" type="line"/>
     </contour>
     <contour>
-      <point x="540" y="0" type="line"/>
-      <point x="642" y="0" type="line"/>
-      <point x="309" y="380" type="line"/>
-      <point x="315" y="358" type="line"/>
-      <point x="630" y="694" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="543" y="0" type="line"/>
+      <point x="269" y="380" type="line"/>
+      <point x="275" y="358" type="line"/>
       <point x="534" y="694" type="line"/>
-      <point x="228" y="361" type="line"/>
+      <point x="438" y="694" type="line"/>
+      <point x="186" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="148" y="694" type="line"/>
+      <point x="106" y="0" type="line"/>
+      <point x="189" y="0" type="line"/>
+      <point x="189" y="694" type="line"/>
+      <point x="106" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lira.glif b/src/Cantarell-Regular.ufo/glyphs/lira.glif
index 0ff14715..e1bd2810 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lira.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lira" format="2">
-  <advance width="646"/>
+  <advance width="580"/>
   <unicode hex="20A4"/>
   <outline>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="572" y="0" type="line"/>
-      <point x="572" y="72" type="line"/>
-      <point x="185" y="72" type="line"/>
-      <point x="229" y="90"/>
-      <point x="245" y="145"/>
-      <point x="245" y="208" type="curve" smooth="yes"/>
-      <point x="245" y="491" type="line" smooth="yes"/>
-      <point x="245" y="577"/>
-      <point x="296" y="631"/>
-      <point x="404" y="631" type="curve" smooth="yes"/>
-      <point x="442" y="631"/>
-      <point x="480" y="624"/>
-      <point x="521" y="612" type="curve"/>
-      <point x="545" y="681" type="line"/>
-      <point x="503" y="697"/>
-      <point x="463" y="704"/>
-      <point x="416" y="704" type="curve" smooth="yes"/>
-      <point x="248" y="704"/>
-      <point x="168" y="615"/>
-      <point x="168" y="481" type="curve" smooth="yes"/>
-      <point x="168" y="198" type="line" smooth="yes"/>
-      <point x="168" y="141"/>
-      <point x="143" y="90"/>
-      <point x="90" y="72" type="curve"/>
+      <point x="58" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="72" type="line"/>
+      <point x="153" y="72" type="line"/>
+      <point x="194" y="90"/>
+      <point x="221" y="144"/>
+      <point x="221" y="208" type="curve" smooth="yes"/>
+      <point x="221" y="491" type="line" smooth="yes"/>
+      <point x="221" y="584"/>
+      <point x="269" y="631"/>
+      <point x="366" y="631" type="curve" smooth="yes"/>
+      <point x="398" y="631"/>
+      <point x="434" y="626"/>
+      <point x="480" y="612" type="curve"/>
+      <point x="504" y="681" type="line"/>
+      <point x="463" y="697"/>
+      <point x="424" y="704"/>
+      <point x="377" y="704" type="curve" smooth="yes"/>
+      <point x="225" y="704"/>
+      <point x="144" y="626"/>
+      <point x="144" y="481" type="curve" smooth="yes"/>
+      <point x="144" y="198" type="line" smooth="yes"/>
+      <point x="144" y="141"/>
+      <point x="109" y="89"/>
+      <point x="58" y="72" type="curve"/>
     </contour>
     <contour>
-      <point x="103" y="408" type="line"/>
-      <point x="478" y="408" type="line"/>
-      <point x="478" y="468" type="line"/>
-      <point x="103" y="468" type="line"/>
+      <point x="65" y="404" type="line"/>
+      <point x="445" y="404" type="line"/>
+      <point x="445" y="471" type="line"/>
+      <point x="65" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="103" y="248" type="line"/>
-      <point x="478" y="248" type="line"/>
-      <point x="478" y="308" type="line"/>
-      <point x="103" y="308" type="line"/>
+      <point x="65" y="227" type="line"/>
+      <point x="445" y="227" type="line"/>
+      <point x="445" y="294" type="line"/>
+      <point x="65" y="294" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
index a4c356f9..67cc35ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
@@ -1,35 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="liraTurkish" format="2">
-  <advance width="650"/>
+  <advance width="580"/>
   <unicode hex="20BA"/>
   <outline>
     <contour>
-      <point x="232" y="0" type="line"/>
-      <point x="437" y="0"/>
-      <point x="573" y="132"/>
-      <point x="573" y="330" type="curve"/>
-      <point x="493" y="330" type="line"/>
-      <point x="493" y="174"/>
-      <point x="393" y="70"/>
-      <point x="242" y="70" type="curve"/>
+      <point x="143" y="0" type="line"/>
+      <point x="220" y="0" type="line" smooth="yes"/>
+      <point x="398" y="0"/>
+      <point x="518" y="133"/>
+      <point x="518" y="330" type="curve"/>
+      <point x="439" y="330" type="line"/>
+      <point x="439" y="174"/>
+      <point x="352" y="70"/>
+      <point x="220" y="70" type="curve"/>
+      <point x="220" y="694" type="line"/>
+      <point x="143" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="165" y="0" type="line"/>
-      <point x="242" y="0" type="line"/>
-      <point x="242" y="694" type="line"/>
-      <point x="165" y="694" type="line"/>
+      <point x="87" y="392" type="line"/>
+      <point x="390" y="561" type="line"/>
+      <point x="361" y="615" type="line"/>
+      <point x="58" y="446" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="393" type="line"/>
-      <point x="406" y="571" type="line"/>
-      <point x="378" y="625" type="line"/>
-      <point x="75" y="446" type="line"/>
-    </contour>
-    <contour>
-      <point x="116" y="252" type="line"/>
-      <point x="406" y="421" type="line"/>
-      <point x="378" y="475" type="line"/>
-      <point x="90" y="305" type="line"/>
+      <point x="102" y="220" type="line"/>
+      <point x="392" y="382" type="line"/>
+      <point x="363" y="436" type="line"/>
+      <point x="73" y="274" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/manat.glif b/src/Cantarell-Regular.ufo/glyphs/manat.glif
index 795855a0..50d789d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/manat.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/manat.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="manat" format="2">
-  <advance width="727"/>
+  <advance width="580"/>
   <unicode hex="20BC"/>
   <outline>
     <contour>
-      <point x="102" y="0" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="176" y="228" type="line" smooth="yes"/>
-      <point x="176" y="406"/>
-      <point x="249" y="525"/>
-      <point x="358" y="525" type="curve" smooth="yes"/>
-      <point x="473" y="525"/>
-      <point x="550" y="402"/>
-      <point x="550" y="218" type="curve" smooth="yes"/>
-      <point x="550" y="0" type="line"/>
-      <point x="624" y="0" type="line"/>
-      <point x="624" y="228" type="line" smooth="yes"/>
-      <point x="624" y="448"/>
-      <point x="522" y="595"/>
-      <point x="368" y="595" type="curve" smooth="yes"/>
-      <point x="208" y="595"/>
-      <point x="102" y="444"/>
-      <point x="102" y="218" type="curve" smooth="yes"/>
+      <point x="45" y="0" type="line"/>
+      <point x="119" y="0" type="line"/>
+      <point x="119" y="228" type="line" smooth="yes"/>
+      <point x="119" y="423"/>
+      <point x="177" y="525"/>
+      <point x="287" y="525" type="curve" smooth="yes"/>
+      <point x="403" y="525"/>
+      <point x="463" y="420"/>
+      <point x="463" y="218" type="curve" smooth="yes"/>
+      <point x="463" y="0" type="line"/>
+      <point x="537" y="0" type="line"/>
+      <point x="537" y="228" type="line" smooth="yes"/>
+      <point x="537" y="469"/>
+      <point x="454" y="595"/>
+      <point x="296" y="595" type="curve" smooth="yes"/>
+      <point x="131" y="595"/>
+      <point x="45" y="466"/>
+      <point x="45" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="327" y="100" type="line"/>
-      <point x="401" y="100" type="line"/>
-      <point x="401" y="694" type="line"/>
-      <point x="327" y="694" type="line"/>
+      <point x="256" y="100" type="line"/>
+      <point x="328" y="100" type="line"/>
+      <point x="328" y="694" type="line"/>
+      <point x="256" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/naira.glif b/src/Cantarell-Regular.ufo/glyphs/naira.glif
index d3cd3dbb..ab646b73 100644
--- a/src/Cantarell-Regular.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/naira.glif
@@ -1,32 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="naira" format="2">
-  <advance width="922"/>
+  <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="699" y="444" type="line"/>
-      <point x="699" y="384" type="line"/>
-      <point x="834" y="384" type="line"/>
-      <point x="834" y="444" type="line"/>
+      <point x="459" y="471" type="line"/>
+      <point x="459" y="404" type="line"/>
+      <point x="564" y="404" type="line"/>
+      <point x="564" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="699" y="314" type="line"/>
-      <point x="699" y="254" type="line"/>
-      <point x="834" y="254" type="line"/>
-      <point x="834" y="314" type="line"/>
+      <point x="459" y="294" type="line"/>
+      <point x="459" y="227" type="line"/>
+      <point x="564" y="227" type="line"/>
+      <point x="564" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="224" y="254" type="line"/>
-      <point x="224" y="314" type="line"/>
-      <point x="88" y="314" type="line"/>
-      <point x="88" y="254" type="line"/>
+      <point x="123" y="227" type="line"/>
+      <point x="123" y="294" type="line"/>
+      <point x="17" y="294" type="line"/>
+      <point x="17" y="227" type="line"/>
     </contour>
     <contour>
-      <point x="224" y="384" type="line"/>
-      <point x="224" y="444" type="line"/>
-      <point x="88" y="444" type="line"/>
-      <point x="88" y="384" type="line"/>
+      <point x="123" y="404" type="line"/>
+      <point x="123" y="471" type="line"/>
+      <point x="17" y="471" type="line"/>
+      <point x="17" y="404" type="line"/>
+    </contour>
+    <contour>
+      <point x="95" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="142" y="605" type="line"/>
+      <point x="398" y="0" type="line"/>
+      <point x="486" y="0" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="411" y="694" type="line"/>
+      <point x="410" y="87" type="line"/>
+      <point x="441" y="87" type="line"/>
+      <point x="186" y="694" type="line"/>
+      <point x="95" y="694" type="line"/>
     </contour>
-    <component base="N" xOffset="67"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peseta.glif b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
index bfdc87bb..1e2e9a9c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
@@ -1,20 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peseta" format="2">
-  <advance width="794"/>
+  <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
     <contour>
-      <point x="587" y="494" type="line"/>
-      <point x="587" y="434" type="line"/>
-      <point x="718" y="434" type="line"/>
-      <point x="718" y="494" type="line"/>
+      <point x="452" y="488" type="line"/>
+      <point x="452" y="421" type="line"/>
+      <point x="569" y="421" type="line"/>
+      <point x="569" y="488" type="line"/>
     </contour>
     <contour>
-      <point x="207" y="434" type="line"/>
-      <point x="207" y="494" type="line"/>
-      <point x="76" y="494" type="line"/>
-      <point x="76" y="434" type="line"/>
+      <point x="128" y="421" type="line"/>
+      <point x="128" y="488" type="line"/>
+      <point x="21" y="488" type="line"/>
+      <point x="21" y="421" type="line"/>
+    </contour>
+    <contour>
+      <point x="99" y="0" type="line"/>
+      <point x="181" y="0" type="line"/>
+      <point x="181" y="242" type="line"/>
+      <point x="268" y="242" type="line" smooth="yes"/>
+      <point x="400" y="242"/>
+      <point x="489" y="334"/>
+      <point x="489" y="473" type="curve" smooth="yes"/>
+      <point x="489" y="606"/>
+      <point x="407" y="694"/>
+      <point x="283" y="694" type="curve" smooth="yes"/>
+      <point x="99" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="181" y="314" type="line"/>
+      <point x="181" y="622" type="line"/>
+      <point x="274" y="622" type="line" smooth="yes"/>
+      <point x="352" y="622"/>
+      <point x="404" y="556"/>
+      <point x="404" y="458" type="curve" smooth="yes"/>
+      <point x="404" y="365"/>
+      <point x="361" y="314"/>
+      <point x="283" y="314" type="curve" smooth="yes"/>
     </contour>
-    <component base="P" xOffset="60"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peso.glif b/src/Cantarell-Regular.ufo/glyphs/peso.glif
index 27830b5e..c8813f72 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peso.glif
@@ -1,57 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="peso" format="2">
-  <advance width="800"/>
+  <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
     <contour>
-      <point x="595" y="564" type="line"/>
-      <point x="595" y="504" type="line"/>
-      <point x="716" y="504" type="line"/>
-      <point x="716" y="564" type="line"/>
+      <point x="452" y="588" type="line"/>
+      <point x="452" y="521" type="line"/>
+      <point x="559" y="521" type="line"/>
+      <point x="559" y="588" type="line"/>
     </contour>
     <contour>
-      <point x="215" y="504" type="line"/>
-      <point x="215" y="564" type="line"/>
-      <point x="84" y="564" type="line"/>
-      <point x="84" y="504" type="line"/>
+      <point x="128" y="521" type="line"/>
+      <point x="128" y="588" type="line"/>
+      <point x="21" y="588" type="line"/>
+      <point x="21" y="521" type="line"/>
     </contour>
     <contour>
-      <point x="595" y="424" type="line"/>
-      <point x="595" y="364" type="line"/>
-      <point x="716" y="364" type="line"/>
-      <point x="716" y="424" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="181" y="0" type="line"/>
+      <point x="181" y="242" type="line"/>
+      <point x="268" y="242" type="line" smooth="yes"/>
+      <point x="400" y="242"/>
+      <point x="489" y="334"/>
+      <point x="489" y="473" type="curve" smooth="yes"/>
+      <point x="489" y="606"/>
+      <point x="407" y="694"/>
+      <point x="283" y="694" type="curve" smooth="yes"/>
+      <point x="99" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="215" y="364" type="line"/>
-      <point x="215" y="424" type="line"/>
-      <point x="84" y="424" type="line"/>
-      <point x="84" y="364" type="line"/>
+      <point x="181" y="314" type="line"/>
+      <point x="181" y="622" type="line"/>
+      <point x="274" y="622" type="line" smooth="yes"/>
+      <point x="352" y="622"/>
+      <point x="404" y="556"/>
+      <point x="404" y="458" type="curve" smooth="yes"/>
+      <point x="404" y="365"/>
+      <point x="361" y="314"/>
+      <point x="283" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="174" y="0" type="line"/>
-      <point x="257" y="0" type="line"/>
-      <point x="257" y="694" type="line"/>
-      <point x="174" y="694" type="line"/>
+      <point x="452" y="411" type="line"/>
+      <point x="452" y="344" type="line"/>
+      <point x="559" y="344" type="line"/>
+      <point x="559" y="411" type="line"/>
     </contour>
     <contour>
-      <point x="227" y="242" type="line"/>
-      <point x="375" y="242" type="line" smooth="yes"/>
-      <point x="530" y="242"/>
-      <point x="634" y="334"/>
-      <point x="634" y="473" type="curve" smooth="yes"/>
-      <point x="634" y="606"/>
-      <point x="536" y="694"/>
-      <point x="390" y="694" type="curve" smooth="yes"/>
-      <point x="227" y="694" type="line"/>
-      <point x="227" y="622" type="line"/>
-      <point x="380" y="622" type="line" smooth="yes"/>
-      <point x="481" y="622"/>
-      <point x="549" y="556"/>
-      <point x="549" y="458" type="curve" smooth="yes"/>
-      <point x="549" y="364"/>
-      <point x="493" y="314"/>
-      <point x="390" y="314" type="curve" smooth="yes"/>
-      <point x="227" y="314" type="line"/>
+      <point x="128" y="344" type="line"/>
+      <point x="128" y="411" type="line"/>
+      <point x="21" y="411" type="line"/>
+      <point x="21" y="344" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ruble.glif b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
index 51c39226..df6c31d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
@@ -1,39 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ruble" format="2">
-  <advance width="735"/>
+  <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
     <contour>
-      <point x="192" y="0" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="275" y="694" type="line"/>
-      <point x="192" y="694" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="212" y="0" type="line"/>
+      <point x="212" y="694" type="line"/>
+      <point x="129" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="86" y="100" type="line"/>
-      <point x="439" y="100" type="line"/>
-      <point x="439" y="160" type="line"/>
-      <point x="86" y="160" type="line"/>
+      <point x="48" y="88" type="line"/>
+      <point x="356" y="88" type="line"/>
+      <point x="356" y="155" type="line"/>
+      <point x="48" y="155" type="line"/>
     </contour>
     <contour>
-      <point x="86" y="242" type="line"/>
-      <point x="393" y="242" type="line" smooth="yes"/>
-      <point x="548" y="242"/>
-      <point x="652" y="334"/>
-      <point x="652" y="473" type="curve" smooth="yes"/>
-      <point x="652" y="606"/>
-      <point x="554" y="694"/>
-      <point x="408" y="694" type="curve" smooth="yes"/>
-      <point x="245" y="694" type="line"/>
-      <point x="245" y="622" type="line"/>
-      <point x="398" y="622" type="line" smooth="yes"/>
-      <point x="499" y="622"/>
-      <point x="567" y="556"/>
-      <point x="567" y="458" type="curve" smooth="yes"/>
-      <point x="567" y="364"/>
-      <point x="511" y="314"/>
-      <point x="408" y="314" type="curve" smooth="yes"/>
-      <point x="86" y="314" type="line"/>
+      <point x="48" y="265" type="line"/>
+      <point x="308" y="265" type="line" smooth="yes"/>
+      <point x="445" y="265"/>
+      <point x="534" y="364"/>
+      <point x="534" y="490" type="curve" smooth="yes"/>
+      <point x="534" y="613"/>
+      <point x="450" y="694"/>
+      <point x="322" y="694" type="curve" smooth="yes"/>
+      <point x="177" y="694" type="line"/>
+      <point x="177" y="622" type="line"/>
+      <point x="314" y="622" type="line" smooth="yes"/>
+      <point x="394" y="622"/>
+      <point x="449" y="563"/>
+      <point x="449" y="474" type="curve" smooth="yes"/>
+      <point x="449" y="394"/>
+      <point x="404" y="337"/>
+      <point x="323" y="337" type="curve" smooth="yes"/>
+      <point x="48" y="337" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif 
b/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
index 00fc6127..de999803 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rupeeI_ndian.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rupeeIndian" format="2">
-  <advance width="673"/>
+  <advance width="580"/>
   <unicode hex="20B9"/>
   <outline>
     <contour>
-      <point x="96" y="295" type="line"/>
-      <point x="263" y="295" type="line" smooth="yes"/>
-      <point x="406" y="295"/>
-      <point x="505" y="372"/>
-      <point x="505" y="499" type="curve" smooth="yes"/>
-      <point x="505" y="625"/>
-      <point x="407" y="694"/>
-      <point x="273" y="694" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
-      <point x="96" y="632" type="line"/>
-      <point x="263" y="632" type="line" smooth="yes"/>
-      <point x="360" y="632"/>
-      <point x="420" y="584"/>
-      <point x="420" y="491" type="curve" smooth="yes"/>
-      <point x="420" y="401"/>
-      <point x="364" y="359"/>
-      <point x="273" y="359" type="curve" smooth="yes"/>
-      <point x="96" y="359" type="line"/>
+      <point x="50" y="270" type="line"/>
+      <point x="217" y="270" type="line" smooth="yes"/>
+      <point x="360" y="270"/>
+      <point x="459" y="342"/>
+      <point x="459" y="481" type="curve" smooth="yes"/>
+      <point x="459" y="620"/>
+      <point x="361" y="694"/>
+      <point x="227" y="694" type="curve" smooth="yes"/>
+      <point x="50" y="694" type="line"/>
+      <point x="50" y="632" type="line"/>
+      <point x="217" y="632" type="line" smooth="yes"/>
+      <point x="314" y="632"/>
+      <point x="374" y="579"/>
+      <point x="374" y="473" type="curve" smooth="yes"/>
+      <point x="374" y="371"/>
+      <point x="318" y="334"/>
+      <point x="227" y="334" type="curve" smooth="yes"/>
+      <point x="50" y="334" type="line"/>
     </contour>
     <contour>
-      <point x="476" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="360" y="310" type="line"/>
-      <point x="265" y="310" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="529" y="0" type="line"/>
+      <point x="314" y="285" type="line"/>
+      <point x="219" y="285" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="466" type="line"/>
-      <point x="588" y="466" type="line"/>
-      <point x="588" y="526" type="line"/>
-      <point x="96" y="526" type="line"/>
+      <point x="50" y="451" type="line"/>
+      <point x="542" y="451" type="line"/>
+      <point x="542" y="515" type="line"/>
+      <point x="50" y="515" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="638" type="line"/>
-      <point x="588" y="638" type="line"/>
-      <point x="588" y="698" type="line"/>
-      <point x="96" y="698" type="line"/>
+      <point x="50" y="638" type="line"/>
+      <point x="542" y="638" type="line"/>
+      <point x="542" y="698" type="line"/>
+      <point x="50" y="698" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sterling.glif b/src/Cantarell-Regular.ufo/glyphs/sterling.glif
index 1bac7373..fb547011 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sterling.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sterling.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sterling" format="2">
-  <advance width="637"/>
+  <advance width="580"/>
   <unicode hex="00A3"/>
   <outline>
     <contour>
-      <point x="81" y="0" type="line"/>
-      <point x="563" y="0" type="line"/>
-      <point x="563" y="72" type="line"/>
-      <point x="176" y="72" type="line"/>
-      <point x="220" y="90"/>
-      <point x="236" y="145"/>
-      <point x="236" y="208" type="curve" smooth="yes"/>
-      <point x="236" y="491" type="line" smooth="yes"/>
-      <point x="236" y="577"/>
-      <point x="287" y="631"/>
-      <point x="395" y="631" type="curve" smooth="yes"/>
-      <point x="433" y="631"/>
-      <point x="471" y="624"/>
-      <point x="512" y="612" type="curve"/>
-      <point x="536" y="681" type="line"/>
-      <point x="494" y="697"/>
-      <point x="454" y="704"/>
-      <point x="407" y="704" type="curve" smooth="yes"/>
-      <point x="239" y="704"/>
-      <point x="159" y="615"/>
-      <point x="159" y="481" type="curve" smooth="yes"/>
-      <point x="159" y="198" type="line" smooth="yes"/>
-      <point x="159" y="141"/>
-      <point x="134" y="90"/>
-      <point x="81" y="72" type="curve"/>
+      <point x="58" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="72" type="line"/>
+      <point x="153" y="72" type="line"/>
+      <point x="194" y="90"/>
+      <point x="221" y="144"/>
+      <point x="221" y="208" type="curve" smooth="yes"/>
+      <point x="221" y="491" type="line" smooth="yes"/>
+      <point x="221" y="584"/>
+      <point x="269" y="631"/>
+      <point x="366" y="631" type="curve" smooth="yes"/>
+      <point x="398" y="631"/>
+      <point x="434" y="626"/>
+      <point x="480" y="612" type="curve"/>
+      <point x="504" y="681" type="line"/>
+      <point x="463" y="697"/>
+      <point x="424" y="704"/>
+      <point x="377" y="704" type="curve" smooth="yes"/>
+      <point x="225" y="704"/>
+      <point x="144" y="626"/>
+      <point x="144" y="481" type="curve" smooth="yes"/>
+      <point x="144" y="198" type="line" smooth="yes"/>
+      <point x="144" y="141"/>
+      <point x="109" y="89"/>
+      <point x="58" y="72" type="curve"/>
     </contour>
     <contour>
-      <point x="89" y="318" type="line"/>
-      <point x="454" y="318" type="line"/>
-      <point x="454" y="378" type="line"/>
-      <point x="89" y="378" type="line"/>
+      <point x="66" y="315" type="line"/>
+      <point x="424" y="315" type="line"/>
+      <point x="424" y="382" type="line"/>
+      <point x="66" y="382" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tenge.glif b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
index a067c2d7..3056ce13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tenge.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tenge.glif
@@ -1,7 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tenge" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20B8"/>
   <outline>
+    <contour>
+      <point x="249" y="0" type="line"/>
+      <point x="332" y="0" type="line"/>
+      <point x="332" y="450" type="line"/>
+      <point x="536" y="450" type="line"/>
+      <point x="536" y="517" type="line"/>
+      <point x="44" y="517" type="line"/>
+      <point x="44" y="450" type="line"/>
+      <point x="249" y="450" type="line"/>
+    </contour>
+    <contour>
+      <point x="44" y="627" type="line"/>
+      <point x="536" y="627" type="line"/>
+      <point x="536" y="694" type="line"/>
+      <point x="44" y="694" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
index f5d41ab5..d21c3478 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
@@ -1,7 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tugrik" format="2">
-  <advance width="600"/>
+  <advance width="580"/>
   <unicode hex="20AE"/>
   <outline>
+    <contour>
+      <point x="67" y="622" type="line"/>
+      <point x="248" y="622" type="line"/>
+      <point x="248" y="0" type="line"/>
+      <point x="331" y="0" type="line"/>
+      <point x="331" y="622" type="line"/>
+      <point x="513" y="622" type="line"/>
+      <point x="513" y="694" type="line"/>
+      <point x="67" y="694" type="line"/>
+    </contour>
+    <contour>
+      <point x="139" y="291" type="line"/>
+      <point x="465" y="440" type="line"/>
+      <point x="437" y="495" type="line"/>
+      <point x="114" y="346" type="line"/>
+    </contour>
+    <contour>
+      <point x="154" y="129" type="line"/>
+      <point x="465" y="270" type="line"/>
+      <point x="437" y="325" type="line"/>
+      <point x="129" y="184" type="line"/>
+    </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/won.glif b/src/Cantarell-Regular.ufo/glyphs/won.glif
index dde068cc..4f54bf75 100644
--- a/src/Cantarell-Regular.ufo/glyphs/won.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/won.glif
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="won" format="2">
-  <advance width="1180"/>
+  <advance width="580"/>
   <unicode hex="20A9"/>
   <outline>
     <contour>
-      <point x="94" y="252" type="line"/>
-      <point x="266" y="252" type="line"/>
-      <point x="266" y="312" type="line"/>
-      <point x="94" y="312" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="202" y="0" type="line"/>
+      <point x="304" y="649" type="line"/>
+      <point x="271" y="649" type="line"/>
+      <point x="381" y="0" type="line"/>
+      <point x="452" y="0" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="496" y="694" type="line"/>
+      <point x="403" y="38" type="line"/>
+      <point x="435" y="38" type="line"/>
+      <point x="330" y="684" type="line"/>
+      <point x="253" y="684" type="line"/>
+      <point x="154" y="38" type="line"/>
+      <point x="180" y="38" type="line"/>
+      <point x="93" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="94" y="392" type="line"/>
-      <point x="616" y="392" type="line"/>
-      <point x="616" y="452" type="line"/>
-      <point x="94" y="452" type="line"/>
+      <point x="0" y="404" type="line"/>
+      <point x="580" y="404" type="line"/>
+      <point x="580" y="468" type="line"/>
+      <point x="0" y="468" type="line"/>
     </contour>
     <contour>
-      <point x="1084" y="252" type="line"/>
-      <point x="1084" y="312" type="line"/>
-      <point x="912" y="312" type="line"/>
-      <point x="912" y="252" type="line"/>
+      <point x="0" y="227" type="line"/>
+      <point x="112" y="227" type="line"/>
+      <point x="112" y="294" type="line"/>
+      <point x="0" y="294" type="line"/>
     </contour>
     <contour>
-      <point x="1084" y="392" type="line"/>
-      <point x="1084" y="452" type="line"/>
-      <point x="592" y="452" type="line"/>
-      <point x="592" y="392" type="line"/>
+      <point x="468" y="227" type="line"/>
+      <point x="580" y="227" type="line"/>
+      <point x="580" y="294" type="line"/>
+      <point x="468" y="294" type="line"/>
     </contour>
-    <component base="W" xOffset="76"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yen.glif b/src/Cantarell-Regular.ufo/glyphs/yen.glif
index ee6754d3..f661c836 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yen.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yen.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yen" format="2">
-  <advance width="711"/>
+  <advance width="580"/>
   <unicode hex="00A5"/>
   <outline>
     <contour>
-      <point x="121" y="128" type="line"/>
-      <point x="594" y="128" type="line"/>
-      <point x="594" y="188" type="line"/>
-      <point x="121" y="188" type="line"/>
+      <point x="251" y="0" type="line"/>
+      <point x="334" y="0" type="line"/>
+      <point x="334" y="309" type="line"/>
+      <point x="539" y="694" type="line"/>
+      <point x="448" y="694" type="line"/>
+      <point x="290" y="372" type="line"/>
+      <point x="301" y="372" type="line"/>
+      <point x="138" y="694" type="line"/>
+      <point x="41" y="694" type="line"/>
+      <point x="251" y="309" type="line"/>
     </contour>
     <contour>
-      <point x="121" y="298" type="line"/>
-      <point x="594" y="298" type="line"/>
-      <point x="594" y="358" type="line"/>
-      <point x="121" y="358" type="line"/>
+      <point x="87" y="121" type="line"/>
+      <point x="498" y="121" type="line"/>
+      <point x="498" y="188" type="line"/>
+      <point x="87" y="188" type="line"/>
     </contour>
     <contour>
-      <point x="316" y="0" type="line"/>
-      <point x="399" y="0" type="line"/>
-      <point x="399" y="309" type="line"/>
-      <point x="639" y="694" type="line"/>
-      <point x="548" y="694" type="line"/>
-      <point x="355" y="372" type="line"/>
-      <point x="366" y="372" type="line"/>
-      <point x="168" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-      <point x="316" y="309" type="line"/>
+      <point x="87" y="298" type="line"/>
+      <point x="498" y="298" type="line"/>
+      <point x="498" y="365" type="line"/>
+      <point x="87" y="365" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 5f00fe05..d250a554 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -2137,6 +2137,7 @@
       <string>florin</string>
       <string>franc</string>
       <string>guarani</string>
+      <string>hryvnia</string>
       <string>kip</string>
       <string>lira</string>
       <string>liraTurkish</string>
@@ -2147,11 +2148,10 @@
       <string>ruble</string>
       <string>rupeeIndian</string>
       <string>sterling</string>
-      <string>won</string>
-      <string>yen</string>
-      <string>hryvnia</string>
       <string>tenge</string>
       <string>tugrik</string>
+      <string>won</string>
+      <string>yen</string>
       <string>bulletoperator</string>
       <string>commercialMinusSign</string>
       <string>divisionslash</string>
@@ -3569,9 +3569,6 @@
       <string>_slash.zero</string>
       <string>_slash.zero.osf</string>
       <string>_typoquote</string>
-      <string>hryvnia</string>
-      <string>tenge</string>
-      <string>tugrik</string>
     </array>
     <key>width</key>
     <integer>30</integer>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]