[cantarell-fonts/respacing] Thin some extra bold currency symbols, space other symbols and numbers



commit 138e8d9bf469df4afc90b5e2827b08c00dad9852
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Oct 13 21:11:50 2019 +0100

    Thin some extra bold currency symbols, space other symbols and numbers

 src/Cantarell-Bold.ufo/glyphs/blank.glif           | 26 ++++--
 src/Cantarell-Bold.ufo/glyphs/comma.glif           | 16 ++--
 src/Cantarell-Bold.ufo/glyphs/currency.glif        | 80 +++++++++---------
 src/Cantarell-Bold.ufo/glyphs/dollar.glif          | 66 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif      | 90 ++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/eight.glif           | 90 ++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/eight.numr.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/eight.osf.glif       | 98 ++++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/eightinferior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/five.dnom.glif       | 64 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/five.glif            | 64 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/five.numr.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/five.osf.glif        | 72 +++++++++-------
 src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif     |  6 +-
 src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/fivesixths.glif      |  6 +-
 src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/florin.glif          | 60 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/four.dnom.glif       | 26 +++---
 src/Cantarell-Bold.ufo/glyphs/four.glif            | 26 +++---
 src/Cantarell-Bold.ufo/glyphs/four.numr.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/four.osf.glif        | 34 +++++---
 src/Cantarell-Bold.ufo/glyphs/fourfifths.glif      |  6 +-
 src/Cantarell-Bold.ufo/glyphs/fourinferior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/foursuperior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/germandbls.glif      |  6 ++
 src/Cantarell-Bold.ufo/glyphs/increment.glif       | 20 ++---
 src/Cantarell-Bold.ufo/glyphs/micro.glif           | 56 +++++++------
 src/Cantarell-Bold.ufo/glyphs/naira.glif           |  8 +-
 src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif       | 78 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/nine.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/nine.numr.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/nine.osf.glif        | 86 ++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/nineinferior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/one.dnom.glif        | 18 ++--
 src/Cantarell-Bold.ufo/glyphs/one.glif             | 16 ++--
 src/Cantarell-Bold.ufo/glyphs/one.numr.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/one.osf.glif         | 26 ++++--
 src/Cantarell-Bold.ufo/glyphs/oneeighth.glif       |  6 +-
 src/Cantarell-Bold.ufo/glyphs/onefifth.glif        |  6 +-
 src/Cantarell-Bold.ufo/glyphs/onefraction.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/onehalf.glif         |  6 +-
 src/Cantarell-Bold.ufo/glyphs/oneinferior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/oneninth.glif        |  6 +-
 src/Cantarell-Bold.ufo/glyphs/onequarter.glif      |  6 +-
 src/Cantarell-Bold.ufo/glyphs/oneseventh.glif      |  6 +-
 src/Cantarell-Bold.ufo/glyphs/onesixth.glif        |  6 +-
 src/Cantarell-Bold.ufo/glyphs/onesuperior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/onetenth.glif        |  8 +-
 src/Cantarell-Bold.ufo/glyphs/onethird.glif        |  6 +-
 src/Cantarell-Bold.ufo/glyphs/paragraph.glif       | 38 +++++----
 src/Cantarell-Bold.ufo/glyphs/partialdiff.glif     | 78 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/perthousand.glif     |  8 ++
 src/Cantarell-Bold.ufo/glyphs/peseta.glif          |  8 +-
 src/Cantarell-Bold.ufo/glyphs/peso.glif            |  8 +-
 src/Cantarell-Bold.ufo/glyphs/product.glif         | 26 ++++--
 src/Cantarell-Bold.ufo/glyphs/radical.glif         | 20 ++---
 src/Cantarell-Bold.ufo/glyphs/semicolon.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif      | 18 ++--
 src/Cantarell-Bold.ufo/glyphs/seven.numr.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/seven.osf.glif       | 26 ++++--
 src/Cantarell-Bold.ufo/glyphs/seveneighths.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/seveninferior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/six.dnom.glif        | 78 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/six.glif             | 78 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/six.numr.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/six.osf.glif         | 86 ++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/sixinferior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/summation.glif       | 26 +++---
 src/Cantarell-Bold.ufo/glyphs/three.dnom.glif      | 86 +++++++++----------
 src/Cantarell-Bold.ufo/glyphs/three.glif           | 86 +++++++++----------
 src/Cantarell-Bold.ufo/glyphs/three.numr.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/three.osf.glif       | 90 +++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/threeeighths.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/threefifths.glif     |  6 +-
 src/Cantarell-Bold.ufo/glyphs/threeinferior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/threequarters.glif   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/threesuperior.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/two.dnom.glif        | 50 +++++------
 src/Cantarell-Bold.ufo/glyphs/two.glif             | 50 +++++------
 src/Cantarell-Bold.ufo/glyphs/two.numr.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/two.osf.glif         | 58 +++++++------
 src/Cantarell-Bold.ufo/glyphs/twofifths.glif       |  6 +-
 src/Cantarell-Bold.ufo/glyphs/twoinferior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/twosuperior.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/twothirds.glif       |  6 +-
 src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif       | 52 ++++++------
 src/Cantarell-Bold.ufo/glyphs/zero.numr.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/zero.osf.glif        | 60 +++++++------
 src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/zerothird.glif       |  6 +-
 src/Cantarell-Light.ufo/glyphs/blank.glif          | 26 ++++--
 src/Cantarell-Light.ufo/glyphs/eight.osf.glif      | 98 ++++++++++++----------
 src/Cantarell-Light.ufo/glyphs/five.osf.glif       | 72 +++++++++-------
 src/Cantarell-Light.ufo/glyphs/four.osf.glif       | 34 +++++---
 src/Cantarell-Light.ufo/glyphs/germandbls.glif     | 88 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/layerinfo.plist     |  2 +-
 src/Cantarell-Light.ufo/glyphs/micro.glif          | 56 +++++++------
 src/Cantarell-Light.ufo/glyphs/nine.osf.glif       | 86 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/one.dnom.glif       | 18 ++--
 src/Cantarell-Light.ufo/glyphs/one.numr.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/one.osf.glif        | 10 ++-
 src/Cantarell-Light.ufo/glyphs/oneeighth.glif      |  6 +-
 src/Cantarell-Light.ufo/glyphs/onefifth.glif       |  6 +-
 src/Cantarell-Light.ufo/glyphs/onefraction.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/onehalf.glif        |  6 +-
 src/Cantarell-Light.ufo/glyphs/oneinferior.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/oneninth.glif       |  6 +-
 src/Cantarell-Light.ufo/glyphs/onequarter.glif     |  6 +-
 src/Cantarell-Light.ufo/glyphs/oneseventh.glif     |  6 +-
 src/Cantarell-Light.ufo/glyphs/onesixth.glif       |  6 +-
 src/Cantarell-Light.ufo/glyphs/onesuperior.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/onetenth.glif       |  8 +-
 src/Cantarell-Light.ufo/glyphs/onethird.glif       |  6 +-
 src/Cantarell-Light.ufo/glyphs/paragraph.glif      | 38 +++++----
 src/Cantarell-Light.ufo/glyphs/perthousand.glif    | 10 ++-
 src/Cantarell-Light.ufo/glyphs/product.glif        | 26 ++++--
 src/Cantarell-Light.ufo/glyphs/seven.osf.glif      | 26 ++++--
 src/Cantarell-Light.ufo/glyphs/six.osf.glif        | 86 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/three.osf.glif      | 90 +++++++++++---------
 src/Cantarell-Light.ufo/glyphs/two.osf.glif        | 58 +++++++------
 src/Cantarell-Light.ufo/glyphs/zero.osf.glif       | 60 +++++++------
 src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/blank.glif        | 26 ++++--
 src/Cantarell-Regular.ufo/glyphs/eight.osf.glif    | 98 ++++++++++++----------
 src/Cantarell-Regular.ufo/glyphs/five.osf.glif     | 72 +++++++++-------
 src/Cantarell-Regular.ufo/glyphs/four.osf.glif     | 34 +++++---
 src/Cantarell-Regular.ufo/glyphs/germandbls.glif   |  6 ++
 src/Cantarell-Regular.ufo/glyphs/layerinfo.plist   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/micro.glif        | 56 +++++++------
 src/Cantarell-Regular.ufo/glyphs/nine.osf.glif     | 86 ++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/one.dnom.glif     | 18 ++--
 src/Cantarell-Regular.ufo/glyphs/one.numr.glif     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/one.osf.glif      | 26 ++++--
 src/Cantarell-Regular.ufo/glyphs/oneeighth.glif    |  6 +-
 src/Cantarell-Regular.ufo/glyphs/onefifth.glif     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/onefraction.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/onehalf.glif      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/oneinferior.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/oneninth.glif     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/onequarter.glif   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/oneseventh.glif   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/onesixth.glif     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/onesuperior.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/onetenth.glif     |  8 +-
 src/Cantarell-Regular.ufo/glyphs/onethird.glif     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/paragraph.glif    | 38 +++++----
 src/Cantarell-Regular.ufo/glyphs/perthousand.glif  |  8 ++
 src/Cantarell-Regular.ufo/glyphs/product.glif      | 26 ++++--
 src/Cantarell-Regular.ufo/glyphs/seven.osf.glif    | 26 ++++--
 src/Cantarell-Regular.ufo/glyphs/six.osf.glif      | 86 ++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/three.osf.glif    | 90 +++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/two.osf.glif      | 58 +++++++------
 src/Cantarell-Regular.ufo/glyphs/zero.osf.glif     | 60 +++++++------
 .../glyphs/zero.osf.zero.glif                      |  4 +-
 161 files changed, 2283 insertions(+), 1905 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/blank.glif b/src/Cantarell-Bold.ufo/glyphs/blank.glif
index cb464a30..1e4d4f5d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/blank.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="861"/>
+  <advance width="843"/>
   <unicode hex="2423"/>
   <note>
 uni2423
 </note>
   <outline>
     <contour>
-      <point x="80" y="0" type="line"/>
-      <point x="781" y="0" type="line"/>
-      <point x="781" y="256" type="line"/>
-      <point x="638" y="256" type="line"/>
-      <point x="638" y="135" type="line"/>
-      <point x="223" y="135" type="line"/>
-      <point x="223" y="256" type="line"/>
-      <point x="80" y="256" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="772" y="0" type="line"/>
+      <point x="772" y="256" type="line"/>
+      <point x="629" y="256" type="line"/>
+      <point x="629" y="135" type="line"/>
+      <point x="214" y="135" type="line"/>
+      <point x="214" y="256" type="line"/>
+      <point x="71" y="256" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/comma.glif b/src/Cantarell-Bold.ufo/glyphs/comma.glif
index c627c43d..87821082 100644
--- a/src/Cantarell-Bold.ufo/glyphs/comma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/comma.glif
@@ -4,14 +4,14 @@
   <unicode hex="002C"/>
   <outline>
     <contour>
-      <point x="31" y="-179" type="curve"/>
-      <point x="183" y="-179" type="line"/>
-      <point x="226" y="-83"/>
-      <point x="253" y="46"/>
-      <point x="253" y="144" type="curve"/>
-      <point x="75" y="144" type="line"/>
-      <point x="75" y="39"/>
-      <point x="56" y="-90"/>
+      <point x="21" y="-179" type="curve"/>
+      <point x="173" y="-179" type="line"/>
+      <point x="216" y="-83"/>
+      <point x="243" y="46"/>
+      <point x="243" y="144" type="curve"/>
+      <point x="65" y="144" type="line"/>
+      <point x="65" y="39"/>
+      <point x="46" y="-90"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/currency.glif b/src/Cantarell-Bold.ufo/glyphs/currency.glif
index 732d4454..b3ee8091 100644
--- a/src/Cantarell-Bold.ufo/glyphs/currency.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/currency.glif
@@ -4,56 +4,56 @@
   <unicode hex="00A4"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="296" y="88" type="curve" smooth="yes"/>
+      <point x="447" y="88"/>
+      <point x="548" y="190"/>
+      <point x="548" y="344" type="curve" smooth="yes"/>
+      <point x="548" y="487"/>
+      <point x="452" y="583"/>
+      <point x="307" y="583" type="curve" smooth="yes"/>
+      <point x="155" y="583"/>
+      <point x="55" y="481"/>
+      <point x="55" y="330" type="curve" smooth="yes"/>
+      <point x="55" y="186"/>
+      <point x="151" y="88"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="84" y="36" type="line"/>
+      <point x="225" y="176" type="line"/>
+      <point x="148" y="253" type="line"/>
+      <point x="7" y="114" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="522" y="28" type="line"/>
+      <point x="604" y="112" type="line"/>
+      <point x="457" y="254" type="line"/>
+      <point x="375" y="172" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="305" y="237" type="curve" smooth="yes"/>
+      <point x="245" y="237"/>
+      <point x="206" y="278"/>
+      <point x="206" y="339" type="curve" smooth="yes"/>
+      <point x="206" y="397"/>
+      <point x="243" y="434"/>
+      <point x="298" y="434" type="curve" smooth="yes"/>
+      <point x="358" y="434"/>
+      <point x="397" y="393"/>
+      <point x="397" y="333" type="curve" smooth="yes"/>
+      <point x="397" y="276"/>
+      <point x="360" y="237"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="148" y="409" type="line"/>
+      <point x="233" y="491" type="line"/>
+      <point x="81" y="644" type="line"/>
+      <point x="-4" y="560" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="459" y="416" type="line"/>
+      <point x="603" y="557" type="line"/>
+      <point x="518" y="641" type="line"/>
+      <point x="376" y="499" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dollar.glif b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
index 42d4b0fe..52f520ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
@@ -5,41 +5,41 @@
   <outline>
     <contour>
       <point x="286" y="0" type="curve" smooth="yes"/>
-      <point x="456" y="0"/>
-      <point x="552" y="88"/>
-      <point x="552" y="221" type="curve" smooth="yes"/>
-      <point x="552" y="465"/>
-      <point x="239" y="402"/>
-      <point x="239" y="494" type="curve" smooth="yes"/>
-      <point x="239" y="525"/>
-      <point x="272" y="542"/>
-      <point x="333" y="542" type="curve" smooth="yes"/>
-      <point x="381" y="542"/>
-      <point x="440" y="532"/>
-      <point x="486" y="515" type="curve"/>
-      <point x="533" y="653" type="line"/>
-      <point x="479" y="679"/>
-      <point x="405" y="694"/>
-      <point x="339" y="694" type="curve" smooth="yes"/>
-      <point x="173" y="694"/>
-      <point x="59" y="603"/>
-      <point x="59" y="469" type="curve" smooth="yes"/>
-      <point x="59" y="242"/>
-      <point x="370" y="297"/>
-      <point x="370" y="201" type="curve" smooth="yes"/>
-      <point x="370" y="172"/>
-      <point x="346" y="156"/>
-      <point x="285" y="156" type="curve" smooth="yes"/>
-      <point x="231" y="156"/>
-      <point x="159" y="168"/>
-      <point x="95" y="197" type="curve"/>
-      <point x="47" y="55" type="line"/>
-      <point x="113" y="23"/>
-      <point x="198" y="0"/>
+      <point x="453" y="0"/>
+      <point x="549" y="87"/>
+      <point x="549" y="218" type="curve" smooth="yes"/>
+      <point x="549" y="461"/>
+      <point x="231" y="396"/>
+      <point x="231" y="496" type="curve" smooth="yes"/>
+      <point x="231" y="531"/>
+      <point x="267" y="551"/>
+      <point x="332" y="551" type="curve" smooth="yes"/>
+      <point x="379" y="551"/>
+      <point x="438" y="541"/>
+      <point x="485" y="523" type="curve"/>
+      <point x="530" y="653" type="line"/>
+      <point x="476" y="679"/>
+      <point x="402" y="694"/>
+      <point x="338" y="694" type="curve" smooth="yes"/>
+      <point x="174" y="694"/>
+      <point x="62" y="604"/>
+      <point x="62" y="473" type="curve" smooth="yes"/>
+      <point x="62" y="245"/>
+      <point x="378" y="303"/>
+      <point x="378" y="199" type="curve" smooth="yes"/>
+      <point x="378" y="166"/>
+      <point x="351" y="147"/>
+      <point x="286" y="147" type="curve" smooth="yes"/>
+      <point x="232" y="147"/>
+      <point x="161" y="159"/>
+      <point x="95" y="188" type="curve"/>
+      <point x="50" y="55" type="line"/>
+      <point x="116" y="23"/>
+      <point x="199" y="0"/>
     </contour>
     <contour>
-      <point x="231" y="634" type="line"/>
-      <point x="388" y="634" type="line"/>
+      <point x="231" y="636" type="line"/>
+      <point x="388" y="636" type="line"/>
       <point x="388" y="821" type="line"/>
       <point x="231" y="821" type="line"/>
     </contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
index 75be1aa1..a34ddf66 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.dnom.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.dnom" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <note>
 eight
 </note>
   <outline>
     <contour>
-      <point x="207" y="-6" type="curve" smooth="yes"/>
-      <point x="321" y="-6"/>
-      <point x="397" y="49"/>
-      <point x="397" y="127" type="curve" smooth="yes"/>
-      <point x="397" y="263"/>
-      <point x="160" y="233"/>
-      <point x="160" y="296" type="curve" smooth="yes"/>
-      <point x="160" y="309"/>
-      <point x="179" y="320"/>
-      <point x="210" y="320" type="curve" smooth="yes"/>
-      <point x="241" y="320"/>
-      <point x="260" y="309"/>
-      <point x="260" y="291" type="curve" smooth="yes"/>
-      <point x="260" y="271"/>
-      <point x="237" y="258"/>
-      <point x="208" y="259" type="curve"/>
-      <point x="295" y="215" type="line"/>
-      <point x="355" y="238"/>
-      <point x="383" y="275"/>
-      <point x="383" y="315" type="curve" smooth="yes"/>
-      <point x="383" y="380"/>
-      <point x="314" y="422"/>
-      <point x="217" y="422" type="curve" smooth="yes"/>
-      <point x="109" y="422"/>
-      <point x="36" y="368"/>
-      <point x="36" y="289" type="curve" smooth="yes"/>
-      <point x="36" y="151"/>
-      <point x="272" y="180"/>
-      <point x="272" y="120" type="curve" smooth="yes"/>
-      <point x="272" y="107"/>
-      <point x="252" y="96"/>
-      <point x="216" y="96" type="curve" smooth="yes"/>
-      <point x="176" y="96"/>
-      <point x="149" y="112"/>
-      <point x="149" y="136" type="curve" smooth="yes"/>
-      <point x="149" y="161"/>
-      <point x="175" y="170"/>
-      <point x="214" y="167" type="curve"/>
-      <point x="141" y="213" type="line"/>
-      <point x="70" y="203"/>
-      <point x="25" y="167"/>
-      <point x="25" y="113" type="curve" smooth="yes"/>
-      <point x="25" y="42"/>
-      <point x="100" y="-6"/>
+      <point x="215" y="-6" type="curve" smooth="yes"/>
+      <point x="329" y="-6"/>
+      <point x="405" y="49"/>
+      <point x="405" y="127" type="curve" smooth="yes"/>
+      <point x="405" y="263"/>
+      <point x="168" y="233"/>
+      <point x="168" y="296" type="curve" smooth="yes"/>
+      <point x="168" y="311"/>
+      <point x="190" y="323"/>
+      <point x="218" y="323" type="curve" smooth="yes"/>
+      <point x="248" y="323"/>
+      <point x="268" y="310"/>
+      <point x="268" y="291" type="curve" smooth="yes"/>
+      <point x="268" y="271"/>
+      <point x="245" y="258"/>
+      <point x="216" y="259" type="curve"/>
+      <point x="303" y="215" type="line"/>
+      <point x="363" y="238"/>
+      <point x="391" y="275"/>
+      <point x="391" y="315" type="curve" smooth="yes"/>
+      <point x="391" y="380"/>
+      <point x="322" y="422"/>
+      <point x="225" y="422" type="curve" smooth="yes"/>
+      <point x="117" y="422"/>
+      <point x="44" y="368"/>
+      <point x="44" y="289" type="curve" smooth="yes"/>
+      <point x="44" y="151"/>
+      <point x="280" y="180"/>
+      <point x="280" y="120" type="curve" smooth="yes"/>
+      <point x="280" y="105"/>
+      <point x="255" y="93"/>
+      <point x="224" y="93" type="curve" smooth="yes"/>
+      <point x="185" y="93"/>
+      <point x="157" y="111"/>
+      <point x="157" y="136" type="curve" smooth="yes"/>
+      <point x="157" y="161"/>
+      <point x="183" y="170"/>
+      <point x="222" y="167" type="curve"/>
+      <point x="149" y="213" type="line"/>
+      <point x="78" y="203"/>
+      <point x="33" y="167"/>
+      <point x="33" y="113" type="curve" smooth="yes"/>
+      <point x="33" y="42"/>
+      <point x="108" y="-6"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.glif b/src/Cantarell-Bold.ufo/glyphs/eight.glif
index ef046f77..a74197be 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight" format="2">
-  <advance width="609"/>
+  <advance width="620"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="301" y="-10" type="curve" smooth="yes"/>
-      <point x="471" y="-10"/>
-      <point x="583" y="76"/>
-      <point x="583" y="203" type="curve" smooth="yes"/>
-      <point x="583" y="429"/>
-      <point x="215" y="374"/>
-      <point x="215" y="502" type="curve" smooth="yes"/>
-      <point x="215" y="539"/>
-      <point x="249" y="566"/>
-      <point x="303" y="566" type="curve" smooth="yes"/>
-      <point x="357" y="566"/>
-      <point x="392" y="539"/>
-      <point x="392" y="497" type="curve" smooth="yes"/>
-      <point x="392" y="454"/>
-      <point x="354" y="424"/>
-      <point x="298" y="419" type="curve"/>
-      <point x="415" y="359" type="line"/>
-      <point x="508" y="393"/>
-      <point x="560" y="455"/>
-      <point x="560" y="529" type="curve" smooth="yes"/>
-      <point x="560" y="634"/>
-      <point x="458" y="704"/>
-      <point x="312" y="704" type="curve" smooth="yes"/>
-      <point x="152" y="704"/>
-      <point x="47" y="619"/>
-      <point x="47" y="493" type="curve" smooth="yes"/>
-      <point x="47" y="262"/>
-      <point x="415" y="316"/>
-      <point x="415" y="193" type="curve" smooth="yes"/>
-      <point x="415" y="155"/>
-      <point x="376" y="128"/>
-      <point x="312" y="128" type="curve" smooth="yes"/>
-      <point x="242" y="128"/>
-      <point x="196" y="162"/>
-      <point x="196" y="215" type="curve" smooth="yes"/>
-      <point x="196" y="264"/>
-      <point x="236" y="292"/>
-      <point x="306" y="294" type="curve"/>
-      <point x="207" y="357" type="line"/>
-      <point x="95" y="337"/>
-      <point x="28" y="273"/>
-      <point x="28" y="183" type="curve" smooth="yes"/>
-      <point x="28" y="68"/>
-      <point x="139" y="-10"/>
+      <point x="306" y="-10" type="curve" smooth="yes"/>
+      <point x="476" y="-10"/>
+      <point x="588" y="76"/>
+      <point x="588" y="203" type="curve" smooth="yes"/>
+      <point x="588" y="429"/>
+      <point x="220" y="374"/>
+      <point x="220" y="502" type="curve" smooth="yes"/>
+      <point x="220" y="539"/>
+      <point x="254" y="566"/>
+      <point x="308" y="566" type="curve" smooth="yes"/>
+      <point x="362" y="566"/>
+      <point x="397" y="539"/>
+      <point x="397" y="497" type="curve" smooth="yes"/>
+      <point x="397" y="454"/>
+      <point x="359" y="424"/>
+      <point x="303" y="419" type="curve"/>
+      <point x="420" y="359" type="line"/>
+      <point x="513" y="393"/>
+      <point x="565" y="455"/>
+      <point x="565" y="529" type="curve" smooth="yes"/>
+      <point x="565" y="634"/>
+      <point x="463" y="704"/>
+      <point x="317" y="704" type="curve" smooth="yes"/>
+      <point x="157" y="704"/>
+      <point x="52" y="619"/>
+      <point x="52" y="493" type="curve" smooth="yes"/>
+      <point x="52" y="262"/>
+      <point x="420" y="316"/>
+      <point x="420" y="193" type="curve" smooth="yes"/>
+      <point x="420" y="155"/>
+      <point x="381" y="128"/>
+      <point x="317" y="128" type="curve" smooth="yes"/>
+      <point x="247" y="128"/>
+      <point x="201" y="162"/>
+      <point x="201" y="215" type="curve" smooth="yes"/>
+      <point x="201" y="264"/>
+      <point x="241" y="292"/>
+      <point x="311" y="294" type="curve"/>
+      <point x="212" y="357" type="line"/>
+      <point x="100" y="337"/>
+      <point x="33" y="273"/>
+      <point x="33" y="183" type="curve" smooth="yes"/>
+      <point x="33" y="68"/>
+      <point x="144" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif b/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
index 0bb616ba..77b589ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.numr" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <outline>
     <component base="eight.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif b/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
index 9dc13cba..5e2b853c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="597"/>
+  <advance width="614"/>
   <outline>
     <contour>
-      <point x="295" y="-10" type="curve" smooth="yes"/>
-      <point x="464" y="-10"/>
-      <point x="574" y="76"/>
-      <point x="574" y="200" type="curve" smooth="yes"/>
-      <point x="574" y="431"/>
-      <point x="205" y="378"/>
-      <point x="205" y="505" type="curve" smooth="yes"/>
-      <point x="205" y="543"/>
-      <point x="242" y="571"/>
-      <point x="297" y="571" type="curve" smooth="yes"/>
-      <point x="351" y="571"/>
-      <point x="389" y="543"/>
-      <point x="389" y="500" type="curve" smooth="yes"/>
-      <point x="389" y="452"/>
-      <point x="344" y="421"/>
-      <point x="292" y="416" type="curve"/>
-      <point x="405" y="359" type="line"/>
-      <point x="498" y="393"/>
-      <point x="550" y="455"/>
-      <point x="550" y="529" type="curve" smooth="yes"/>
-      <point x="550" y="634"/>
-      <point x="449" y="704"/>
-      <point x="306" y="704" type="curve" smooth="yes"/>
-      <point x="149" y="704"/>
-      <point x="44" y="619"/>
-      <point x="44" y="496" type="curve" smooth="yes"/>
-      <point x="44" y="260"/>
-      <point x="412" y="314"/>
-      <point x="412" y="190" type="curve" smooth="yes"/>
-      <point x="412" y="151"/>
-      <point x="372" y="124"/>
-      <point x="306" y="124" type="curve" smooth="yes"/>
-      <point x="235" y="124"/>
-      <point x="186" y="159"/>
-      <point x="186" y="212" type="curve" smooth="yes"/>
-      <point x="186" y="263"/>
-      <point x="231" y="295"/>
-      <point x="300" y="297" type="curve"/>
-      <point x="204" y="357" type="line"/>
-      <point x="92" y="337"/>
-      <point x="25" y="273"/>
-      <point x="25" y="183" type="curve" smooth="yes"/>
-      <point x="25" y="68"/>
-      <point x="136" y="-10"/>
+      <point x="303" y="-10" type="curve" smooth="yes"/>
+      <point x="472" y="-10"/>
+      <point x="582" y="76"/>
+      <point x="582" y="200" type="curve" smooth="yes"/>
+      <point x="582" y="431"/>
+      <point x="213" y="378"/>
+      <point x="213" y="505" type="curve" smooth="yes"/>
+      <point x="213" y="543"/>
+      <point x="250" y="571"/>
+      <point x="305" y="571" type="curve" smooth="yes"/>
+      <point x="359" y="571"/>
+      <point x="397" y="543"/>
+      <point x="397" y="500" type="curve" smooth="yes"/>
+      <point x="397" y="452"/>
+      <point x="352" y="421"/>
+      <point x="300" y="416" type="curve"/>
+      <point x="413" y="359" type="line"/>
+      <point x="506" y="393"/>
+      <point x="558" y="455"/>
+      <point x="558" y="529" type="curve" smooth="yes"/>
+      <point x="558" y="634"/>
+      <point x="457" y="704"/>
+      <point x="314" y="704" type="curve" smooth="yes"/>
+      <point x="157" y="704"/>
+      <point x="52" y="619"/>
+      <point x="52" y="496" type="curve" smooth="yes"/>
+      <point x="52" y="260"/>
+      <point x="420" y="314"/>
+      <point x="420" y="190" type="curve" smooth="yes"/>
+      <point x="420" y="151"/>
+      <point x="380" y="124"/>
+      <point x="314" y="124" type="curve" smooth="yes"/>
+      <point x="243" y="124"/>
+      <point x="194" y="159"/>
+      <point x="194" y="212" type="curve" smooth="yes"/>
+      <point x="194" y="263"/>
+      <point x="239" y="295"/>
+      <point x="308" y="297" type="curve"/>
+      <point x="212" y="357" type="line"/>
+      <point x="100" y="337"/>
+      <point x="33" y="273"/>
+      <point x="33" y="183" type="curve" smooth="yes"/>
+      <point x="33" y="68"/>
+      <point x="144" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
index e0a11946..0459f5a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eightinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightinferior" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <unicode hex="2088"/>
   <outline>
     <component base="eight.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
index 92daa77a..d4f5663e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eightsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eightsuperior" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <unicode hex="2078"/>
   <outline>
     <component base="eight.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
index 7caaa04a..6177545c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.dnom.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.dnom" format="2">
-  <advance width="403"/>
+  <advance width="419"/>
   <note>
 five
 </note>
   <outline>
     <contour>
-      <point x="175" y="-6" type="curve" smooth="yes"/>
-      <point x="299" y="-6"/>
-      <point x="378" y="49"/>
-      <point x="378" y="142" type="curve" smooth="yes"/>
-      <point x="378" y="222"/>
-      <point x="316" y="266"/>
-      <point x="204" y="266" type="curve" smooth="yes"/>
-      <point x="179" y="266"/>
-      <point x="166" y="264"/>
-      <point x="155" y="256" type="curve"/>
-      <point x="185" y="216" type="line"/>
-      <point x="190" y="305" type="line"/>
-      <point x="353" y="305" type="line"/>
-      <point x="353" y="416" type="line"/>
-      <point x="66" y="416" type="line"/>
-      <point x="54" y="159" type="line"/>
-      <point x="82" y="163"/>
-      <point x="117" y="167"/>
-      <point x="146" y="167" type="curve" smooth="yes"/>
-      <point x="210" y="167"/>
-      <point x="246" y="153"/>
-      <point x="246" y="129" type="curve" smooth="yes"/>
-      <point x="246" y="111"/>
-      <point x="221" y="104"/>
-      <point x="175" y="104" type="curve" smooth="yes"/>
-      <point x="135" y="104"/>
-      <point x="93" y="112"/>
-      <point x="60" y="125" type="curve"/>
-      <point x="25" y="25" type="line"/>
-      <point x="71" y="5"/>
-      <point x="119" y="-6"/>
+      <point x="183" y="-6" type="curve" smooth="yes"/>
+      <point x="307" y="-6"/>
+      <point x="386" y="49"/>
+      <point x="386" y="142" type="curve" smooth="yes"/>
+      <point x="386" y="222"/>
+      <point x="324" y="266"/>
+      <point x="212" y="266" type="curve" smooth="yes"/>
+      <point x="187" y="266"/>
+      <point x="174" y="264"/>
+      <point x="163" y="256" type="curve"/>
+      <point x="193" y="216" type="line"/>
+      <point x="198" y="305" type="line"/>
+      <point x="361" y="305" type="line"/>
+      <point x="361" y="416" type="line"/>
+      <point x="74" y="416" type="line"/>
+      <point x="62" y="159" type="line"/>
+      <point x="90" y="163"/>
+      <point x="125" y="168"/>
+      <point x="154" y="168" type="curve" smooth="yes"/>
+      <point x="217" y="168"/>
+      <point x="254" y="153"/>
+      <point x="254" y="129" type="curve" smooth="yes"/>
+      <point x="254" y="111"/>
+      <point x="229" y="101"/>
+      <point x="183" y="101" type="curve" smooth="yes"/>
+      <point x="148" y="101"/>
+      <point x="107" y="110"/>
+      <point x="68" y="125" type="curve"/>
+      <point x="33" y="25" type="line"/>
+      <point x="79" y="5"/>
+      <point x="127" y="-6"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index de272e70..115d9807 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five" format="2">
-  <advance width="574"/>
+  <advance width="577"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="247" y="-10" type="curve" smooth="yes"/>
-      <point x="430" y="-10"/>
-      <point x="547" y="80"/>
-      <point x="547" y="230" type="curve" smooth="yes"/>
-      <point x="547" y="362"/>
-      <point x="453" y="436"/>
-      <point x="285" y="436" type="curve" smooth="yes"/>
-      <point x="242" y="436"/>
-      <point x="220" y="431"/>
-      <point x="200" y="418" type="curve"/>
-      <point x="243" y="365" type="line"/>
-      <point x="251" y="543" type="line"/>
-      <point x="510" y="543" type="line"/>
-      <point x="510" y="694" type="line"/>
-      <point x="82" y="694" type="line"/>
-      <point x="64" y="287" type="line"/>
-      <point x="107" y="295"/>
-      <point x="162" y="301"/>
-      <point x="203" y="301" type="curve" smooth="yes"/>
-      <point x="307" y="301"/>
-      <point x="367" y="268"/>
-      <point x="367" y="212" type="curve" smooth="yes"/>
-      <point x="367" y="165"/>
-      <point x="324" y="140"/>
-      <point x="246" y="140" type="curve" smooth="yes"/>
-      <point x="186" y="140"/>
-      <point x="119" y="154"/>
-      <point x="69" y="178" type="curve"/>
-      <point x="22" y="42" type="line"/>
-      <point x="89" y="8"/>
-      <point x="165" y="-10"/>
+      <point x="248" y="-10" type="curve" smooth="yes"/>
+      <point x="431" y="-10"/>
+      <point x="548" y="80"/>
+      <point x="548" y="230" type="curve" smooth="yes"/>
+      <point x="548" y="362"/>
+      <point x="454" y="436"/>
+      <point x="286" y="436" type="curve" smooth="yes"/>
+      <point x="243" y="436"/>
+      <point x="221" y="431"/>
+      <point x="201" y="418" type="curve"/>
+      <point x="244" y="365" type="line"/>
+      <point x="252" y="543" type="line"/>
+      <point x="511" y="543" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="83" y="694" type="line"/>
+      <point x="65" y="287" type="line"/>
+      <point x="108" y="295"/>
+      <point x="163" y="301"/>
+      <point x="204" y="301" type="curve" smooth="yes"/>
+      <point x="308" y="301"/>
+      <point x="368" y="268"/>
+      <point x="368" y="212" type="curve" smooth="yes"/>
+      <point x="368" y="165"/>
+      <point x="325" y="140"/>
+      <point x="247" y="140" type="curve" smooth="yes"/>
+      <point x="187" y="140"/>
+      <point x="120" y="154"/>
+      <point x="70" y="178" type="curve"/>
+      <point x="23" y="42" type="line"/>
+      <point x="90" y="8"/>
+      <point x="166" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.numr.glif b/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
index 3346af6b..b53ba8f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.numr" format="2">
-  <advance width="403"/>
+  <advance width="419"/>
   <outline>
     <component base="five.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.osf.glif b/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
index e447cd6f..d51715af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="560"/>
+  <advance width="571"/>
   <outline>
     <contour>
-      <point x="240" y="-110" type="curve" smooth="yes"/>
-      <point x="420" y="-110"/>
-      <point x="537" y="-20"/>
-      <point x="537" y="129" type="curve" smooth="yes"/>
-      <point x="537" y="260"/>
-      <point x="443" y="336"/>
-      <point x="276" y="336" type="curve" smooth="yes"/>
-      <point x="239" y="336"/>
-      <point x="211" y="331"/>
-      <point x="188" y="318" type="curve"/>
-      <point x="230" y="268" type="line"/>
-      <point x="239" y="451" type="line"/>
-      <point x="501" y="451" type="line"/>
-      <point x="501" y="594" type="line"/>
-      <point x="78" y="594" type="line"/>
-      <point x="60" y="192" type="line"/>
-      <point x="103" y="200"/>
-      <point x="162" y="206"/>
-      <point x="199" y="206" type="curve" smooth="yes"/>
-      <point x="302" y="206"/>
-      <point x="366" y="171"/>
-      <point x="366" y="112" type="curve" smooth="yes"/>
-      <point x="366" y="60"/>
-      <point x="318" y="32"/>
-      <point x="240" y="32" type="curve" smooth="yes"/>
-      <point x="178" y="32"/>
-      <point x="109" y="49"/>
-      <point x="63" y="72" type="curve"/>
-      <point x="18" y="-58" type="line"/>
-      <point x="85" y="-92"/>
-      <point x="161" y="-110"/>
+      <point x="245" y="-110" type="curve" smooth="yes"/>
+      <point x="425" y="-110"/>
+      <point x="542" y="-20"/>
+      <point x="542" y="129" type="curve" smooth="yes"/>
+      <point x="542" y="260"/>
+      <point x="448" y="336"/>
+      <point x="281" y="336" type="curve" smooth="yes"/>
+      <point x="244" y="336"/>
+      <point x="216" y="331"/>
+      <point x="193" y="318" type="curve"/>
+      <point x="235" y="268" type="line"/>
+      <point x="244" y="451" type="line"/>
+      <point x="506" y="451" type="line"/>
+      <point x="506" y="594" type="line"/>
+      <point x="83" y="594" type="line"/>
+      <point x="65" y="192" type="line"/>
+      <point x="108" y="200"/>
+      <point x="167" y="206"/>
+      <point x="204" y="206" type="curve" smooth="yes"/>
+      <point x="307" y="206"/>
+      <point x="371" y="171"/>
+      <point x="371" y="112" type="curve" smooth="yes"/>
+      <point x="371" y="60"/>
+      <point x="323" y="32"/>
+      <point x="245" y="32" type="curve" smooth="yes"/>
+      <point x="183" y="32"/>
+      <point x="114" y="49"/>
+      <point x="68" y="72" type="curve"/>
+      <point x="23" y="-58" type="line"/>
+      <point x="90" y="-92"/>
+      <point x="166" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif b/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
index 71e134f3..7cef5646 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fiveeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveeighths" format="2">
-  <advance width="1073"/>
+  <advance width="1105"/>
   <unicode hex="215D"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="403"/>
-    <component base="eight.dnom" xOffset="652"/>
+    <component base="fraction" xOffset="419"/>
+    <component base="eight.dnom" xOffset="668"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif b/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
index 695d9148..aee04dfd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fiveinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fiveinferior" format="2">
-  <advance width="403"/>
+  <advance width="419"/>
   <unicode hex="2085"/>
   <outline>
     <component base="five.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif b/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
index be766861..f35e6784 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fivesixths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesixths" format="2">
-  <advance width="1066"/>
+  <advance width="1098"/>
   <unicode hex="215A"/>
   <outline>
     <component base="five.numr"/>
-    <component base="fraction" xOffset="403"/>
-    <component base="six.dnom" xOffset="652"/>
+    <component base="fraction" xOffset="419"/>
+    <component base="six.dnom" xOffset="668"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
index f48adda1..656727ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fivesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fivesuperior" format="2">
-  <advance width="403"/>
+  <advance width="419"/>
   <unicode hex="2075"/>
   <outline>
     <component base="five.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/florin.glif b/src/Cantarell-Bold.ufo/glyphs/florin.glif
index 45cdec1f..26662a5a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/florin.glif
@@ -4,40 +4,40 @@
   <unicode hex="0192"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="172" y="0" type="line"/>
+      <point x="345" y="0" type="line"/>
+      <point x="345" y="534" type="line" smooth="yes"/>
+      <point x="345" y="581"/>
+      <point x="372" y="607"/>
+      <point x="419" y="607" type="curve" smooth="yes"/>
+      <point x="441" y="607"/>
+      <point x="469" y="601"/>
+      <point x="496" y="589" type="curve"/>
+      <point x="532" y="723" type="line"/>
+      <point x="501" y="740"/>
+      <point x="455" y="749"/>
+      <point x="407" y="749" type="curve" smooth="yes"/>
+      <point x="261" y="749"/>
+      <point x="172" y="662"/>
+      <point x="172" y="518" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="93" y="355" type="line"/>
+      <point x="482" y="355" type="line"/>
+      <point x="482" y="490" type="line"/>
+      <point x="93" y="490" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="172" y="-227" type="line"/>
+      <point x="276" y="-197"/>
+      <point x="345" y="-111"/>
+      <point x="345" y="-13" type="curve" smooth="yes"/>
+      <point x="345" y="0" type="line"/>
+      <point x="172" y="0" type="line"/>
+      <point x="172" y="-25" type="line" smooth="yes"/>
+      <point x="172" y="-70"/>
+      <point x="150" y="-112"/>
+      <point x="117" y="-131" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
index 6bdcf08e..2ef6432a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.dnom.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.dnom" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <note>
 four
 </note>
   <outline>
     <contour>
-      <point x="208" y="-2" type="line"/>
-      <point x="333" y="-2" type="line"/>
-      <point x="333" y="416" type="line"/>
-      <point x="212" y="416" type="line"/>
-      <point x="5" y="131" type="line"/>
-      <point x="5" y="64" type="line"/>
-      <point x="412" y="64" type="line"/>
-      <point x="412" y="172" type="line"/>
-      <point x="74" y="173" type="line"/>
-      <point x="109" y="133" type="line"/>
-      <point x="225" y="300" type="line"/>
-      <point x="208" y="335" type="line"/>
+      <point x="216" y="-2" type="line"/>
+      <point x="341" y="-2" type="line"/>
+      <point x="341" y="416" type="line"/>
+      <point x="220" y="416" type="line"/>
+      <point x="13" y="131" type="line"/>
+      <point x="13" y="64" type="line"/>
+      <point x="420" y="64" type="line"/>
+      <point x="420" y="172" type="line"/>
+      <point x="82" y="173" type="line"/>
+      <point x="117" y="133" type="line"/>
+      <point x="233" y="300" type="line"/>
+      <point x="216" y="335" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.glif b/src/Cantarell-Bold.ufo/glyphs/four.glif
index 467bb424..be0a3d37 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four" format="2">
-  <advance width="635"/>
+  <advance width="643"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
-      <point x="329" y="-5" type="line"/>
-      <point x="498" y="-5" type="line"/>
-      <point x="498" y="694" type="line"/>
-      <point x="334" y="694" type="line"/>
-      <point x="11" y="215" type="line"/>
-      <point x="11" y="124" type="line"/>
-      <point x="620" y="124" type="line"/>
-      <point x="620" y="270" type="line"/>
-      <point x="99" y="272" type="line"/>
-      <point x="149" y="217" type="line"/>
-      <point x="350" y="534" type="line"/>
-      <point x="329" y="583" type="line"/>
+      <point x="335" y="-5" type="line"/>
+      <point x="504" y="-5" type="line"/>
+      <point x="504" y="694" type="line"/>
+      <point x="340" y="694" type="line"/>
+      <point x="17" y="215" type="line"/>
+      <point x="17" y="124" type="line"/>
+      <point x="626" y="124" type="line"/>
+      <point x="626" y="270" type="line"/>
+      <point x="105" y="272" type="line"/>
+      <point x="155" y="217" type="line"/>
+      <point x="356" y="534" type="line"/>
+      <point x="335" y="583" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.numr.glif b/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
index 02f3e4f2..c3aa0a5c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.numr" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <outline>
     <component base="four.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.osf.glif b/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
index 497f37af..8dc9c462 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="618"/>
+  <advance width="639"/>
   <outline>
     <contour>
-      <point x="323" y="-105" type="line"/>
-      <point x="487" y="-105" type="line"/>
-      <point x="487" y="594" type="line"/>
-      <point x="328" y="594" type="line"/>
-      <point x="4" y="115" type="line"/>
-      <point x="4" y="26" type="line"/>
-      <point x="609" y="26" type="line"/>
-      <point x="609" y="168" type="line"/>
-      <point x="92" y="170" type="line"/>
-      <point x="139" y="117" type="line"/>
-      <point x="343" y="437" type="line"/>
-      <point x="323" y="483" type="line"/>
+      <point x="336" y="-105" type="line"/>
+      <point x="500" y="-105" type="line"/>
+      <point x="500" y="594" type="line"/>
+      <point x="341" y="594" type="line"/>
+      <point x="17" y="115" type="line"/>
+      <point x="17" y="26" type="line"/>
+      <point x="622" y="26" type="line"/>
+      <point x="622" y="168" type="line"/>
+      <point x="105" y="170" type="line"/>
+      <point x="152" y="117" type="line"/>
+      <point x="356" y="437" type="line"/>
+      <point x="336" y="483" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif b/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
index 8ef48340..07978785 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourfifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourfifths" format="2">
-  <advance width="1073"/>
+  <advance width="1105"/>
   <unicode hex="2158"/>
   <outline>
     <component base="four.numr"/>
-    <component base="fraction" xOffset="421"/>
-    <component base="five.dnom" xOffset="670"/>
+    <component base="fraction" xOffset="437"/>
+    <component base="five.dnom" xOffset="686"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif b/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
index c58b043c..4e21b022 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourinferior" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <unicode hex="2084"/>
   <outline>
     <component base="four.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif b/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
index 0caf79de..45071904 100644
--- a/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/foursuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="foursuperior" format="2">
-  <advance width="421"/>
+  <advance width="437"/>
   <unicode hex="2074"/>
   <outline>
     <component base="four.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/germandbls.glif b/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
index e0f1d897..e71e0982 100644
--- a/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/germandbls.glif
@@ -46,4 +46,10 @@
       <point x="357" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/increment.glif b/src/Cantarell-Bold.ufo/glyphs/increment.glif
index cf448b20..5f84e233 100644
--- a/src/Cantarell-Bold.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="693"/>
+  <advance width="717"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="26" y="1" type="line"/>
-      <point x="666" y="1" type="line"/>
-      <point x="666" y="107" type="line"/>
-      <point x="466" y="694" type="line"/>
-      <point x="249" y="694" type="line"/>
-      <point x="26" y="107" type="line"/>
+      <point x="38" y="1" type="line"/>
+      <point x="678" y="1" type="line"/>
+      <point x="678" y="107" type="line"/>
+      <point x="478" y="694" type="line"/>
+      <point x="261" y="694" type="line"/>
+      <point x="38" y="107" type="line"/>
     </contour>
     <contour>
-      <point x="191" y="136" type="line"/>
-      <point x="342" y="571" type="line"/>
-      <point x="494" y="136" type="line"/>
+      <point x="203" y="136" type="line"/>
+      <point x="354" y="571" type="line"/>
+      <point x="506" y="136" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/micro.glif b/src/Cantarell-Bold.ufo/glyphs/micro.glif
index 5d9510f4..bc5930b9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="626"/>
+  <advance width="610"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="316" y="-6" type="curve" smooth="yes"/>
-      <point x="367" y="-6"/>
-      <point x="424" y="25"/>
-      <point x="452" y="91" type="curve"/>
-      <point x="409" y="185" type="line"/>
-      <point x="384" y="158"/>
-      <point x="361" y="144"/>
-      <point x="330" y="144" type="curve" smooth="yes"/>
-      <point x="283" y="144"/>
-      <point x="243" y="181"/>
-      <point x="228" y="250" type="curve"/>
-      <point x="200" y="149" type="line"/>
-      <point x="207" y="24"/>
-      <point x="264" y="-6"/>
+      <point x="298" y="-6" type="curve" smooth="yes"/>
+      <point x="349" y="-6"/>
+      <point x="406" y="25"/>
+      <point x="434" y="91" type="curve"/>
+      <point x="391" y="185" type="line"/>
+      <point x="366" y="158"/>
+      <point x="343" y="144"/>
+      <point x="312" y="144" type="curve" smooth="yes"/>
+      <point x="265" y="144"/>
+      <point x="225" y="181"/>
+      <point x="210" y="250" type="curve"/>
+      <point x="182" y="149" type="line"/>
+      <point x="189" y="24"/>
+      <point x="246" y="-6"/>
     </contour>
     <contour>
-      <point x="80" y="-217" type="line"/>
-      <point x="250" y="-217" type="line"/>
-      <point x="250" y="490" type="line"/>
-      <point x="80" y="490" type="line"/>
+      <point x="62" y="-217" type="line"/>
+      <point x="228" y="-217" type="line"/>
+      <point x="228" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="421" y="0" type="line"/>
-      <point x="566" y="0" type="line"/>
-      <point x="566" y="490" type="line"/>
-      <point x="393" y="490" type="line"/>
-      <point x="393" y="114" type="line"/>
+      <point x="403" y="0" type="line"/>
+      <point x="548" y="0" type="line"/>
+      <point x="548" y="490" type="line"/>
+      <point x="375" y="490" type="line"/>
+      <point x="375" y="114" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/naira.glif b/src/Cantarell-Bold.ufo/glyphs/naira.glif
index 96606b34..529e097a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/naira.glif
@@ -29,14 +29,14 @@
     </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="219" y="0" type="line"/>
+      <point x="219" 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="379" y="694" type="line"/>
+      <point x="377" 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"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
index 4bbd3c0e..8b64cb05 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.dnom" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <note>
 nine
 </note>
   <outline>
     <contour>
-      <point x="206" y="422" type="curve" smooth="yes"/>
-      <point x="98" y="422"/>
-      <point x="27" y="362"/>
-      <point x="27" y="273" type="curve" smooth="yes"/>
-      <point x="27" y="195"/>
-      <point x="81" y="143"/>
-      <point x="162" y="143" type="curve" smooth="yes"/>
-      <point x="221" y="143"/>
-      <point x="270" y="169"/>
-      <point x="295" y="218" type="curve"/>
-      <point x="263" y="259" type="line"/>
-      <point x="248" y="251"/>
-      <point x="223" y="244"/>
-      <point x="201" y="244" type="curve" smooth="yes"/>
-      <point x="170" y="244"/>
-      <point x="150" y="260"/>
-      <point x="150" y="283" type="curve" smooth="yes"/>
-      <point x="150" y="303"/>
-      <point x="167" y="317"/>
-      <point x="196" y="317" type="curve" smooth="yes"/>
-      <point x="240" y="317"/>
-      <point x="265" y="277"/>
-      <point x="265" y="206" type="curve" smooth="yes"/>
-      <point x="265" y="136"/>
-      <point x="229" y="97"/>
-      <point x="159" y="97" type="curve" smooth="yes"/>
-      <point x="132" y="97"/>
-      <point x="94" y="104"/>
-      <point x="65" y="115" type="curve"/>
-      <point x="33" y="20" type="line"/>
-      <point x="67" y="4"/>
-      <point x="114" y="-6"/>
-      <point x="164" y="-6" type="curve" smooth="yes"/>
-      <point x="310" y="-6"/>
-      <point x="390" y="76"/>
-      <point x="390" y="216" type="curve" smooth="yes"/>
-      <point x="390" y="352"/>
-      <point x="323" y="422"/>
+      <point x="214" y="422" type="curve" smooth="yes"/>
+      <point x="106" y="422"/>
+      <point x="35" y="362"/>
+      <point x="35" y="273" type="curve" smooth="yes"/>
+      <point x="35" y="195"/>
+      <point x="89" y="143"/>
+      <point x="170" y="143" type="curve" smooth="yes"/>
+      <point x="229" y="143"/>
+      <point x="278" y="169"/>
+      <point x="303" y="218" type="curve"/>
+      <point x="271" y="259" type="line"/>
+      <point x="256" y="251"/>
+      <point x="231" y="244"/>
+      <point x="209" y="244" type="curve" smooth="yes"/>
+      <point x="178" y="244"/>
+      <point x="158" y="260"/>
+      <point x="158" y="283" type="curve" smooth="yes"/>
+      <point x="158" y="305"/>
+      <point x="177" y="320"/>
+      <point x="204" y="320" type="curve" smooth="yes"/>
+      <point x="247" y="320"/>
+      <point x="273" y="278"/>
+      <point x="273" y="206" type="curve" smooth="yes"/>
+      <point x="273" y="136"/>
+      <point x="237" y="97"/>
+      <point x="167" y="97" type="curve" smooth="yes"/>
+      <point x="140" y="97"/>
+      <point x="102" y="104"/>
+      <point x="73" y="115" type="curve"/>
+      <point x="41" y="20" type="line"/>
+      <point x="75" y="4"/>
+      <point x="122" y="-6"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="318" y="-6"/>
+      <point x="398" y="76"/>
+      <point x="398" y="216" type="curve" smooth="yes"/>
+      <point x="398" y="352"/>
+      <point x="331" y="422"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.glif b/src/Cantarell-Bold.ufo/glyphs/nine.glif
index b30c2d69..d5f046a9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="604"/>
+  <advance width="610"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="597" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="610" yOffset="694"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif b/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
index 79cdcfe2..4a7b6aa6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.numr" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <outline>
     <component base="nine.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
index e83af3e9..d3282caa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="594"/>
+  <advance width="604"/>
   <outline>
     <contour>
-      <point x="291" y="604" type="curve" smooth="yes"/>
-      <point x="134" y="604"/>
-      <point x="28" y="507"/>
-      <point x="28" y="363" type="curve" smooth="yes"/>
-      <point x="28" y="236"/>
-      <point x="111" y="149"/>
-      <point x="235" y="149" type="curve" smooth="yes"/>
-      <point x="330" y="149"/>
-      <point x="402" y="198"/>
-      <point x="444" y="283" type="curve"/>
-      <point x="403" y="342" type="line"/>
-      <point x="375" y="306"/>
-      <point x="332" y="282"/>
-      <point x="287" y="282" type="curve" smooth="yes"/>
-      <point x="230" y="282"/>
-      <point x="189" y="320"/>
-      <point x="189" y="376" type="curve" smooth="yes"/>
-      <point x="189" y="430"/>
-      <point x="225" y="467"/>
-      <point x="279" y="467" type="curve" smooth="yes"/>
-      <point x="358" y="467"/>
-      <point x="402" y="384"/>
-      <point x="402" y="250" type="curve" smooth="yes"/>
-      <point x="402" y="106"/>
-      <point x="340" y="24"/>
-      <point x="225" y="24" type="curve" smooth="yes"/>
-      <point x="180" y="24"/>
-      <point x="121" y="37"/>
-      <point x="82" y="55" type="curve"/>
-      <point x="39" y="-69" type="line"/>
-      <point x="91" y="-95"/>
-      <point x="158" y="-110"/>
-      <point x="230" y="-110" type="curve" smooth="yes"/>
-      <point x="448" y="-110"/>
-      <point x="565" y="26"/>
-      <point x="565" y="264" type="curve" smooth="yes"/>
-      <point x="565" y="487"/>
-      <point x="464" y="604"/>
+      <point x="295" y="604" type="curve" smooth="yes"/>
+      <point x="138" y="604"/>
+      <point x="32" y="507"/>
+      <point x="32" y="363" type="curve" smooth="yes"/>
+      <point x="32" y="236"/>
+      <point x="115" y="149"/>
+      <point x="239" y="149" type="curve" smooth="yes"/>
+      <point x="334" y="149"/>
+      <point x="406" y="198"/>
+      <point x="448" y="283" type="curve"/>
+      <point x="407" y="342" type="line"/>
+      <point x="379" y="306"/>
+      <point x="336" y="282"/>
+      <point x="291" y="282" type="curve" smooth="yes"/>
+      <point x="234" y="282"/>
+      <point x="193" y="320"/>
+      <point x="193" y="376" type="curve" smooth="yes"/>
+      <point x="193" y="430"/>
+      <point x="229" y="467"/>
+      <point x="283" y="467" type="curve" smooth="yes"/>
+      <point x="362" y="467"/>
+      <point x="406" y="384"/>
+      <point x="406" y="250" type="curve" smooth="yes"/>
+      <point x="406" y="106"/>
+      <point x="344" y="24"/>
+      <point x="229" y="24" type="curve" smooth="yes"/>
+      <point x="184" y="24"/>
+      <point x="125" y="37"/>
+      <point x="86" y="55" type="curve"/>
+      <point x="43" y="-69" type="line"/>
+      <point x="95" y="-95"/>
+      <point x="162" y="-110"/>
+      <point x="234" y="-110" type="curve" smooth="yes"/>
+      <point x="452" y="-110"/>
+      <point x="569" y="26"/>
+      <point x="569" y="264" type="curve" smooth="yes"/>
+      <point x="569" y="487"/>
+      <point x="468" y="604"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif b/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
index b37edce3..86858945 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nineinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nineinferior" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <unicode hex="2089"/>
   <outline>
     <component base="nine.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
index 2c099aab..064f96a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ninesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ninesuperior" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <unicode hex="2079"/>
   <outline>
     <component base="nine.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
index 3a6f070f..0e536853 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.dnom.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="323"/>
+  <advance width="339"/>
   <note>
 one
 </note>
   <outline>
     <contour>
-      <point x="132" y="0" type="line"/>
-      <point x="269" y="0" type="line"/>
-      <point x="269" y="416" type="line"/>
-      <point x="188" y="416" type="line"/>
-      <point x="-3" y="329" type="line"/>
-      <point x="49" y="230" type="line"/>
-      <point x="174" y="274" type="line"/>
-      <point x="132" y="318" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="277" y="416" type="line"/>
+      <point x="196" y="416" type="line"/>
+      <point x="5" y="329" type="line"/>
+      <point x="57" y="230" type="line"/>
+      <point x="182" y="279" type="line"/>
+      <point x="140" y="318" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.glif b/src/Cantarell-Bold.ufo/glyphs/one.glif
index 090efaad..ab8bf889 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -4,14 +4,14 @@
   <unicode hex="0031"/>
   <outline>
     <contour>
-      <point x="225" y="0" type="line"/>
-      <point x="398" y="0" type="line"/>
-      <point x="398" y="694" type="line"/>
-      <point x="295" y="694" type="line"/>
-      <point x="16" y="555" type="line"/>
-      <point x="81" y="431" type="line"/>
-      <point x="279" y="514" type="line"/>
-      <point x="225" y="569" type="line"/>
+      <point x="220" y="0" type="line"/>
+      <point x="393" y="0" type="line"/>
+      <point x="393" y="694" type="line"/>
+      <point x="290" y="694" type="line"/>
+      <point x="11" y="555" type="line"/>
+      <point x="76" y="431" type="line"/>
+      <point x="274" y="514" type="line"/>
+      <point x="220" y="569" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.numr.glif b/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
index 8dcd5c07..8bed591a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="323"/>
+  <advance width="339"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.osf.glif b/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
index fbe0ae1a..01fe1aa1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="432"/>
+  <advance width="486"/>
   <outline>
     <contour>
-      <point x="216" y="0" type="line"/>
-      <point x="384" y="0" type="line"/>
-      <point x="384" y="594" type="line"/>
-      <point x="281" y="594" type="line"/>
-      <point x="2" y="455" type="line"/>
-      <point x="67" y="331" type="line"/>
-      <point x="265" y="414" type="line"/>
-      <point x="216" y="469" type="line"/>
+      <point x="225" y="0" type="line"/>
+      <point x="393" y="0" type="line"/>
+      <point x="393" y="594" type="line"/>
+      <point x="290" y="594" type="line"/>
+      <point x="11" y="455" type="line"/>
+      <point x="76" y="331" type="line"/>
+      <point x="274" y="414" type="line"/>
+      <point x="225" y="469" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif b/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
index 29018ea1..25b7b5ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="993"/>
+  <advance width="1025"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="eight.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="eight.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onefifth.glif b/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
index 08d2925d..1e57f5ed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="975"/>
+  <advance width="1007"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="five.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="five.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onefraction.glif b/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
index 6e18a85d..f81514bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="572"/>
+  <advance width="588"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
+    <component base="fraction" xOffset="339"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onehalf.glif b/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
index 453390bd..38bb2c4f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="973"/>
+  <advance width="1005"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="two.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="two.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif b/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
index 3699aef1..0f74da49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="323"/>
+  <advance width="339"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneninth.glif b/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
index cc414ab3..572e17bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="986"/>
+  <advance width="1018"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="nine.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="nine.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onequarter.glif b/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
index bbbe868e..75a5a14d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="993"/>
+  <advance width="1025"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="four.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="four.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif b/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
index 0689820c..d9afc27d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="934"/>
+  <advance width="966"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="seven.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="seven.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onesixth.glif b/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
index c7339906..e6383ca2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="986"/>
+  <advance width="1018"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="six.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="six.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif b/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
index 9e72ade5..c0f11b7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="323"/>
+  <advance width="339"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onetenth.glif b/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
index 3fa8233c..e22f9293 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1343"/>
+  <advance width="1391"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="one.dnom" xOffset="572"/>
-    <component base="zero.dnom" xOffset="895"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="one.dnom" xOffset="588"/>
+    <component base="zero.dnom" xOffset="927"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/onethird.glif b/src/Cantarell-Bold.ufo/glyphs/onethird.glif
index ab6110c9..8dc045f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="968"/>
+  <advance width="1000"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="323"/>
-    <component base="three.dnom" xOffset="572"/>
+    <component base="fraction" xOffset="339"/>
+    <component base="three.dnom" xOffset="588"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/paragraph.glif b/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
index 2f33aa36..f4c0e43b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="758"/>
+  <advance width="734"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="248" y="-177" type="line"/>
-      <point x="406" y="-177" type="line"/>
-      <point x="406" y="554" type="line"/>
-      <point x="515" y="554" type="line"/>
-      <point x="515" y="-177" type="line"/>
-      <point x="678" y="-177" type="line"/>
-      <point x="678" y="694" type="line"/>
-      <point x="278" y="694" type="line" smooth="yes"/>
-      <point x="127" y="694"/>
-      <point x="27" y="604"/>
-      <point x="27" y="454" type="curve" smooth="yes"/>
-      <point x="27" y="313"/>
-      <point x="115" y="209"/>
-      <point x="248" y="209" type="curve"/>
+      <point x="233" y="-177" type="line"/>
+      <point x="391" y="-177" type="line"/>
+      <point x="391" y="554" type="line"/>
+      <point x="500" y="554" type="line"/>
+      <point x="500" y="-177" type="line"/>
+      <point x="663" y="-177" type="line"/>
+      <point x="663" y="694" type="line"/>
+      <point x="263" y="694" type="line" smooth="yes"/>
+      <point x="112" y="694"/>
+      <point x="12" y="604"/>
+      <point x="12" y="454" type="curve" smooth="yes"/>
+      <point x="12" y="313"/>
+      <point x="100" y="209"/>
+      <point x="233" y="209" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
index 080c50d9..3a360887 100644
--- a/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="624"/>
+  <advance width="644"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="274" y="-12" type="curve" smooth="yes"/>
-      <point x="463" y="-12"/>
-      <point x="582" y="137"/>
-      <point x="582" y="366" type="curve" smooth="yes"/>
-      <point x="582" y="581"/>
-      <point x="477" y="701"/>
-      <point x="287" y="701" type="curve" smooth="yes"/>
-      <point x="216" y="701"/>
-      <point x="139" y="685"/>
-      <point x="85" y="658" type="curve"/>
-      <point x="124" y="527" type="line"/>
-      <point x="168" y="545"/>
-      <point x="222" y="557"/>
-      <point x="264" y="557" type="curve" smooth="yes"/>
-      <point x="361" y="557"/>
-      <point x="406" y="494"/>
-      <point x="406" y="358" type="curve" smooth="yes"/>
-      <point x="406" y="222"/>
-      <point x="361" y="132"/>
-      <point x="286" y="132" type="curve" smooth="yes"/>
-      <point x="237" y="132"/>
-      <point x="207" y="170"/>
-      <point x="207" y="219" type="curve" smooth="yes"/>
-      <point x="207" y="271"/>
-      <point x="242" y="302"/>
-      <point x="300" y="302" type="curve" smooth="yes"/>
-      <point x="369" y="302"/>
-      <point x="410" y="259"/>
-      <point x="410" y="185" type="curve"/>
-      <point x="444" y="309" type="line"/>
-      <point x="444" y="391"/>
-      <point x="376" y="446"/>
-      <point x="273" y="446" type="curve" smooth="yes"/>
-      <point x="137" y="446"/>
-      <point x="31" y="348"/>
-      <point x="31" y="209" type="curve" smooth="yes"/>
-      <point x="31" y="75"/>
-      <point x="129" y="-12"/>
+      <point x="286" y="-12" type="curve" smooth="yes"/>
+      <point x="475" y="-12"/>
+      <point x="594" y="137"/>
+      <point x="594" y="366" type="curve" smooth="yes"/>
+      <point x="594" y="581"/>
+      <point x="489" y="701"/>
+      <point x="299" y="701" type="curve" smooth="yes"/>
+      <point x="228" y="701"/>
+      <point x="151" y="685"/>
+      <point x="97" y="658" type="curve"/>
+      <point x="136" y="527" type="line"/>
+      <point x="180" y="545"/>
+      <point x="234" y="557"/>
+      <point x="276" y="557" type="curve" smooth="yes"/>
+      <point x="373" y="557"/>
+      <point x="418" y="494"/>
+      <point x="418" y="358" type="curve" smooth="yes"/>
+      <point x="418" y="222"/>
+      <point x="373" y="132"/>
+      <point x="298" y="132" type="curve" smooth="yes"/>
+      <point x="249" y="132"/>
+      <point x="219" y="170"/>
+      <point x="219" y="219" type="curve" smooth="yes"/>
+      <point x="219" y="271"/>
+      <point x="254" y="302"/>
+      <point x="312" y="302" type="curve" smooth="yes"/>
+      <point x="381" y="302"/>
+      <point x="422" y="259"/>
+      <point x="422" y="185" type="curve"/>
+      <point x="456" y="309" type="line"/>
+      <point x="456" y="391"/>
+      <point x="388" y="446"/>
+      <point x="285" y="446" type="curve" smooth="yes"/>
+      <point x="149" y="446"/>
+      <point x="43" y="348"/>
+      <point x="43" y="209" type="curve" smooth="yes"/>
+      <point x="43" y="75"/>
+      <point x="141" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
index d71ab822..31cb2d18 100644
--- a/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/perthousand.glif
@@ -94,4 +94,12 @@
       <point x="1258" y="112"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peseta.glif b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
index 2a7d8a24..e9ba4ad0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
@@ -17,8 +17,8 @@
     </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="236" y="0" type="line"/>
+      <point x="236" y="204" type="line"/>
       <point x="266" y="204" type="line" smooth="yes"/>
       <point x="432" y="204"/>
       <point x="540" y="307"/>
@@ -29,8 +29,8 @@
       <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="236" y="356" type="line"/>
+      <point x="236" y="542" type="line"/>
       <point x="282" y="542" type="line" smooth="yes"/>
       <point x="329" y="542"/>
       <point x="360" y="504"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peso.glif b/src/Cantarell-Bold.ufo/glyphs/peso.glif
index 00958433..5c76332c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peso.glif
@@ -17,8 +17,8 @@
     </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="236" y="0" type="line"/>
+      <point x="236" y="204" type="line"/>
       <point x="266" y="204" type="line" smooth="yes"/>
       <point x="432" y="204"/>
       <point x="540" y="307"/>
@@ -29,8 +29,8 @@
       <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="236" y="356" type="line"/>
+      <point x="236" y="542" type="line"/>
       <point x="282" y="542" type="line" smooth="yes"/>
       <point x="329" y="542"/>
       <point x="360" y="504"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/product.glif b/src/Cantarell-Bold.ufo/glyphs/product.glif
index 0747199d..8c9ead8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/product.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="789"/>
+  <advance width="771"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="80" y="-95" type="line"/>
-      <point x="256" y="-95" type="line"/>
-      <point x="256" y="538" type="line"/>
-      <point x="533" y="538" type="line"/>
-      <point x="533" y="-95" type="line"/>
-      <point x="709" y="-95" type="line"/>
-      <point x="709" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
+      <point x="71" y="-95" type="line"/>
+      <point x="247" y="-95" type="line"/>
+      <point x="247" y="538" type="line"/>
+      <point x="524" y="538" type="line"/>
+      <point x="524" y="-95" type="line"/>
+      <point x="700" y="-95" type="line"/>
+      <point x="700" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/radical.glif b/src/Cantarell-Bold.ufo/glyphs/radical.glif
index ff43a9b8..73ba2069 100644
--- a/src/Cantarell-Bold.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="604"/>
+  <advance width="611"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="273" y="-59" type="line"/>
-      <point x="423" y="-59" type="line"/>
-      <point x="583" y="739" type="line"/>
-      <point x="413" y="739" type="line"/>
-      <point x="316" y="190" type="line"/>
-      <point x="259" y="343" type="line"/>
-      <point x="24" y="343" type="line"/>
-      <point x="24" y="193" type="line"/>
-      <point x="166" y="193" type="line"/>
+      <point x="285" y="-59" type="line"/>
+      <point x="435" y="-59" type="line"/>
+      <point x="595" y="739" type="line"/>
+      <point x="425" y="739" type="line"/>
+      <point x="328" y="190" type="line"/>
+      <point x="271" y="343" type="line"/>
+      <point x="36" y="343" type="line"/>
+      <point x="36" y="193" type="line"/>
+      <point x="178" y="193" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/semicolon.glif b/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
index 3a2c6264..dfcfe599 100644
--- a/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/semicolon.glif
@@ -3,8 +3,8 @@
   <advance width="286"/>
   <unicode hex="003B"/>
   <outline>
-    <component base="comma" xOffset="-1"/>
-    <component base="period" xOffset="15" yOffset="284"/>
+    <component base="comma"/>
+    <component base="period" xOffset="5" yOffset="284"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
index b998d945..6a3e5f62 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.dnom.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.dnom" format="2">
-  <advance width="362"/>
+  <advance width="378"/>
   <note>
 seven
 </note>
   <outline>
     <contour>
-      <point x="36" y="0" type="line"/>
-      <point x="181" y="0" type="line"/>
-      <point x="360" y="352" type="line"/>
-      <point x="360" y="416" type="line"/>
-      <point x="11" y="416" type="line"/>
-      <point x="11" y="297" type="line"/>
-      <point x="239" y="297" type="line"/>
-      <point x="210" y="332" type="line"/>
+      <point x="37" y="0" type="line"/>
+      <point x="189" y="0" type="line"/>
+      <point x="368" y="352" type="line"/>
+      <point x="368" y="416" type="line"/>
+      <point x="19" y="416" type="line"/>
+      <point x="19" y="299" type="line"/>
+      <point x="247" y="299" type="line"/>
+      <point x="211" y="332" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif b/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
index af3b40b0..f62a5e0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.numr" format="2">
-  <advance width="362"/>
+  <advance width="378"/>
   <outline>
     <component base="seven.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif b/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
index fc36b998..ebef7d1b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="528"/>
+  <advance width="532"/>
   <outline>
     <contour>
-      <point x="67" y="-100" type="line"/>
-      <point x="244" y="-100" type="line"/>
-      <point x="521" y="493" type="line"/>
-      <point x="521" y="594" type="line"/>
-      <point x="9" y="594" type="line"/>
-      <point x="9" y="449" type="line"/>
-      <point x="372" y="449" type="line"/>
-      <point x="346" y="490" type="line"/>
+      <point x="70" y="-100" type="line"/>
+      <point x="247" y="-100" type="line"/>
+      <point x="524" y="493" type="line"/>
+      <point x="524" y="594" type="line"/>
+      <point x="12" y="594" type="line"/>
+      <point x="12" y="449" type="line"/>
+      <point x="375" y="449" type="line"/>
+      <point x="349" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif b/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
index bd9fdeff..b8d15506 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seveneighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveneighths" format="2">
-  <advance width="1032"/>
+  <advance width="1064"/>
   <unicode hex="215E"/>
   <outline>
     <component base="seven.numr"/>
-    <component base="fraction" xOffset="362"/>
-    <component base="eight.dnom" xOffset="611"/>
+    <component base="fraction" xOffset="378"/>
+    <component base="eight.dnom" xOffset="627"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
index 4bf90031..f18437bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seveninferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seveninferior" format="2">
-  <advance width="362"/>
+  <advance width="378"/>
   <unicode hex="2087"/>
   <outline>
     <component base="seven.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
index aa0f37a1..9ebdea3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sevensuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sevensuperior" format="2">
-  <advance width="362"/>
+  <advance width="378"/>
   <unicode hex="2077"/>
   <outline>
     <component base="seven.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
index caa942a2..07c39f48 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.dnom.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.dnom" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <note>
 six
 </note>
   <outline>
     <contour>
-      <point x="208" y="-6" type="curve" smooth="yes"/>
-      <point x="315" y="-6"/>
-      <point x="387" y="54"/>
-      <point x="387" y="144" type="curve" smooth="yes"/>
-      <point x="387" y="221"/>
-      <point x="333" y="273"/>
-      <point x="252" y="273" type="curve" smooth="yes"/>
-      <point x="194" y="273"/>
-      <point x="144" y="248"/>
-      <point x="118" y="198" type="curve"/>
-      <point x="150" y="158" type="line"/>
-      <point x="166" y="165"/>
-      <point x="189" y="172"/>
-      <point x="212" y="172" type="curve" smooth="yes"/>
-      <point x="244" y="172"/>
-      <point x="264" y="156"/>
-      <point x="264" y="134" type="curve" smooth="yes"/>
-      <point x="264" y="113"/>
-      <point x="246" y="99"/>
-      <point x="218" y="99" type="curve" smooth="yes"/>
-      <point x="173" y="99"/>
-      <point x="149" y="140"/>
-      <point x="149" y="211" type="curve" smooth="yes"/>
-      <point x="149" y="281"/>
-      <point x="185" y="319"/>
-      <point x="255" y="319" type="curve" smooth="yes"/>
-      <point x="285" y="319"/>
-      <point x="324" y="311"/>
-      <point x="349" y="302" type="curve"/>
-      <point x="381" y="397" type="line"/>
-      <point x="345" y="413"/>
-      <point x="299" y="422"/>
-      <point x="250" y="422" type="curve" smooth="yes"/>
-      <point x="103" y="422"/>
-      <point x="24" y="340"/>
-      <point x="24" y="200" type="curve" smooth="yes"/>
-      <point x="24" y="64"/>
-      <point x="91" y="-6"/>
+      <point x="216" y="-6" type="curve" smooth="yes"/>
+      <point x="323" y="-6"/>
+      <point x="395" y="54"/>
+      <point x="395" y="144" type="curve" smooth="yes"/>
+      <point x="395" y="221"/>
+      <point x="341" y="273"/>
+      <point x="260" y="273" type="curve" smooth="yes"/>
+      <point x="202" y="273"/>
+      <point x="152" y="248"/>
+      <point x="126" y="198" type="curve"/>
+      <point x="158" y="158" type="line"/>
+      <point x="174" y="165"/>
+      <point x="197" y="172"/>
+      <point x="220" y="172" type="curve" smooth="yes"/>
+      <point x="252" y="172"/>
+      <point x="272" y="156"/>
+      <point x="272" y="134" type="curve" smooth="yes"/>
+      <point x="272" y="112"/>
+      <point x="253" y="96"/>
+      <point x="226" y="96" type="curve" smooth="yes"/>
+      <point x="182" y="96"/>
+      <point x="157" y="138"/>
+      <point x="157" y="211" type="curve" smooth="yes"/>
+      <point x="157" y="281"/>
+      <point x="193" y="319"/>
+      <point x="263" y="319" type="curve" smooth="yes"/>
+      <point x="293" y="319"/>
+      <point x="332" y="311"/>
+      <point x="357" y="302" type="curve"/>
+      <point x="389" y="397" type="line"/>
+      <point x="353" y="413"/>
+      <point x="307" y="422"/>
+      <point x="258" y="422" type="curve" smooth="yes"/>
+      <point x="111" y="422"/>
+      <point x="32" y="340"/>
+      <point x="32" y="200" type="curve" smooth="yes"/>
+      <point x="32" y="64"/>
+      <point x="99" y="-6"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index f33e1f35..f6df36d1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six" format="2">
-  <advance width="604"/>
+  <advance width="609"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="309" y="-10" type="curve" smooth="yes"/>
-      <point x="469" y="-10"/>
-      <point x="575" y="87"/>
-      <point x="575" y="232" type="curve" smooth="yes"/>
-      <point x="575" y="362"/>
-      <point x="492" y="446"/>
-      <point x="368" y="446" type="curve" smooth="yes"/>
-      <point x="276" y="446"/>
-      <point x="203" y="402"/>
-      <point x="160" y="315" type="curve"/>
-      <point x="203" y="255" type="line"/>
-      <point x="232" y="289"/>
-      <point x="273" y="309"/>
-      <point x="314" y="309" type="curve" smooth="yes"/>
-      <point x="370" y="309"/>
-      <point x="407" y="273"/>
-      <point x="407" y="219" type="curve" smooth="yes"/>
-      <point x="407" y="167"/>
-      <point x="373" y="133"/>
-      <point x="321" y="133" type="curve" smooth="yes"/>
-      <point x="245" y="133"/>
-      <point x="202" y="211"/>
-      <point x="202" y="344" type="curve" smooth="yes"/>
-      <point x="202" y="487"/>
-      <point x="263" y="564"/>
-      <point x="377" y="564" type="curve" smooth="yes"/>
-      <point x="422" y="564"/>
-      <point x="479" y="552"/>
-      <point x="520" y="534" type="curve"/>
-      <point x="564" y="663" type="line"/>
-      <point x="511" y="689"/>
-      <point x="445" y="704"/>
-      <point x="370" y="704" type="curve" smooth="yes"/>
-      <point x="149" y="704"/>
-      <point x="32" y="569"/>
-      <point x="32" y="330" type="curve" smooth="yes"/>
-      <point x="32" y="107"/>
-      <point x="133" y="-10"/>
+      <point x="312" y="-10" type="curve" smooth="yes"/>
+      <point x="472" y="-10"/>
+      <point x="578" y="87"/>
+      <point x="578" y="232" type="curve" smooth="yes"/>
+      <point x="578" y="362"/>
+      <point x="495" y="446"/>
+      <point x="371" y="446" type="curve" smooth="yes"/>
+      <point x="279" y="446"/>
+      <point x="206" y="402"/>
+      <point x="163" y="315" type="curve"/>
+      <point x="206" y="255" type="line"/>
+      <point x="235" y="289"/>
+      <point x="276" y="309"/>
+      <point x="317" y="309" type="curve" smooth="yes"/>
+      <point x="373" y="309"/>
+      <point x="410" y="273"/>
+      <point x="410" y="219" type="curve" smooth="yes"/>
+      <point x="410" y="167"/>
+      <point x="376" y="133"/>
+      <point x="324" y="133" type="curve" smooth="yes"/>
+      <point x="248" y="133"/>
+      <point x="205" y="211"/>
+      <point x="205" y="344" type="curve" smooth="yes"/>
+      <point x="205" y="487"/>
+      <point x="266" y="564"/>
+      <point x="380" y="564" type="curve" smooth="yes"/>
+      <point x="425" y="564"/>
+      <point x="482" y="552"/>
+      <point x="523" y="534" type="curve"/>
+      <point x="567" y="663" type="line"/>
+      <point x="514" y="689"/>
+      <point x="448" y="704"/>
+      <point x="373" y="704" type="curve" smooth="yes"/>
+      <point x="152" y="704"/>
+      <point x="35" y="569"/>
+      <point x="35" y="330" type="curve" smooth="yes"/>
+      <point x="35" y="107"/>
+      <point x="136" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.numr.glif b/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
index 5131ce3d..c9ced413 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.numr" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <outline>
     <component base="six.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.osf.glif b/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
index 9529b946..1560b269 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="592"/>
+  <advance width="603"/>
   <outline>
     <contour>
-      <point x="304" y="-10" type="curve" smooth="yes"/>
-      <point x="460" y="-10"/>
-      <point x="566" y="87"/>
-      <point x="566" y="231" type="curve" smooth="yes"/>
-      <point x="566" y="360"/>
-      <point x="482" y="445"/>
-      <point x="360" y="445" type="curve" smooth="yes"/>
-      <point x="263" y="445"/>
-      <point x="190" y="393"/>
-      <point x="150" y="310" type="curve"/>
-      <point x="192" y="252" type="line"/>
-      <point x="221" y="289"/>
-      <point x="263" y="312"/>
-      <point x="308" y="312" type="curve" smooth="yes"/>
-      <point x="366" y="312"/>
-      <point x="405" y="274"/>
-      <point x="405" y="218" type="curve" smooth="yes"/>
-      <point x="405" y="164"/>
-      <point x="370" y="127"/>
-      <point x="316" y="127" type="curve" smooth="yes"/>
-      <point x="237" y="127"/>
-      <point x="192" y="209"/>
-      <point x="192" y="344" type="curve" smooth="yes"/>
-      <point x="192" y="489"/>
-      <point x="255" y="570"/>
-      <point x="370" y="570" type="curve" smooth="yes"/>
-      <point x="417" y="570"/>
-      <point x="475" y="556"/>
-      <point x="513" y="539" type="curve"/>
-      <point x="555" y="663" type="line"/>
-      <point x="504" y="689"/>
-      <point x="437" y="704"/>
-      <point x="364" y="704" type="curve" smooth="yes"/>
-      <point x="146" y="704"/>
-      <point x="29" y="568"/>
-      <point x="29" y="330" type="curve" smooth="yes"/>
-      <point x="29" y="107"/>
-      <point x="130" y="-10"/>
+      <point x="310" y="-10" type="curve" smooth="yes"/>
+      <point x="466" y="-10"/>
+      <point x="572" y="87"/>
+      <point x="572" y="231" type="curve" smooth="yes"/>
+      <point x="572" y="360"/>
+      <point x="488" y="445"/>
+      <point x="366" y="445" type="curve" smooth="yes"/>
+      <point x="269" y="445"/>
+      <point x="196" y="393"/>
+      <point x="156" y="310" type="curve"/>
+      <point x="198" y="252" type="line"/>
+      <point x="227" y="289"/>
+      <point x="269" y="312"/>
+      <point x="314" y="312" type="curve" smooth="yes"/>
+      <point x="372" y="312"/>
+      <point x="411" y="274"/>
+      <point x="411" y="218" type="curve" smooth="yes"/>
+      <point x="411" y="164"/>
+      <point x="376" y="127"/>
+      <point x="322" y="127" type="curve" smooth="yes"/>
+      <point x="243" y="127"/>
+      <point x="198" y="209"/>
+      <point x="198" y="344" type="curve" smooth="yes"/>
+      <point x="198" y="489"/>
+      <point x="261" y="570"/>
+      <point x="376" y="570" type="curve" smooth="yes"/>
+      <point x="423" y="570"/>
+      <point x="481" y="556"/>
+      <point x="519" y="539" type="curve"/>
+      <point x="561" y="663" type="line"/>
+      <point x="510" y="689"/>
+      <point x="443" y="704"/>
+      <point x="370" y="704" type="curve" smooth="yes"/>
+      <point x="152" y="704"/>
+      <point x="35" y="568"/>
+      <point x="35" y="330" type="curve" smooth="yes"/>
+      <point x="35" y="107"/>
+      <point x="136" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif b/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
index 77a37b00..985931b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sixinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixinferior" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <unicode hex="2086"/>
   <outline>
     <component base="six.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif b/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
index 4cb6c2e6..df958cd6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sixsuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sixsuperior" format="2">
-  <advance width="414"/>
+  <advance width="430"/>
   <unicode hex="2076"/>
   <outline>
     <component base="six.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/summation.glif b/src/Cantarell-Bold.ufo/glyphs/summation.glif
index 94c484f7..ff3b7bd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="635"/>
+  <advance width="659"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="35" y="-95" type="line"/>
-      <point x="595" y="-95" type="line"/>
-      <point x="595" y="61" type="line"/>
-      <point x="259" y="61" type="line"/>
-      <point x="477" y="299" type="line"/>
-      <point x="262" y="538" type="line"/>
-      <point x="595" y="538" type="line"/>
-      <point x="595" y="694" type="line"/>
-      <point x="35" y="694" type="line"/>
-      <point x="35" y="573" type="line"/>
-      <point x="278" y="299" type="line"/>
-      <point x="35" y="28" type="line"/>
+      <point x="47" y="-95" type="line"/>
+      <point x="607" y="-95" type="line"/>
+      <point x="607" y="61" type="line"/>
+      <point x="271" y="61" type="line"/>
+      <point x="489" y="299" type="line"/>
+      <point x="274" y="538" type="line"/>
+      <point x="607" y="538" type="line"/>
+      <point x="607" y="694" type="line"/>
+      <point x="47" y="694" type="line"/>
+      <point x="47" y="573" type="line"/>
+      <point x="290" y="299" type="line"/>
+      <point x="47" y="28" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
index f8e5996d..367a8645 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.dnom.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.dnom" format="2">
-  <advance width="396"/>
+  <advance width="412"/>
   <note>
 three
 </note>
   <outline>
     <contour>
-      <point x="164" y="-6" type="curve" smooth="yes"/>
-      <point x="292" y="-6"/>
-      <point x="377" y="45"/>
-      <point x="377" y="121" type="curve" smooth="yes"/>
-      <point x="377" y="175"/>
-      <point x="333" y="218"/>
-      <point x="268" y="225" type="curve"/>
-      <point x="247" y="218" type="line"/>
-      <point x="310" y="216"/>
-      <point x="351" y="252"/>
-      <point x="351" y="309" type="curve" smooth="yes"/>
-      <point x="351" y="380"/>
-      <point x="289" y="422"/>
-      <point x="185" y="422" type="curve" smooth="yes"/>
-      <point x="126" y="422"/>
-      <point x="70" y="409"/>
-      <point x="20" y="386" type="curve"/>
-      <point x="50" y="287" type="line"/>
-      <point x="91" y="301"/>
-      <point x="129" y="309"/>
-      <point x="158" y="309" type="curve" smooth="yes"/>
-      <point x="192" y="309"/>
-      <point x="214" y="302"/>
-      <point x="214" y="289" type="curve" smooth="yes"/>
-      <point x="214" y="271"/>
-      <point x="183" y="259"/>
-      <point x="140" y="259" type="curve" smooth="yes"/>
-      <point x="108" y="259" type="line"/>
-      <point x="108" y="160" type="line"/>
-      <point x="140" y="160" type="line" smooth="yes"/>
-      <point x="199" y="160"/>
-      <point x="239" y="147"/>
-      <point x="239" y="127" type="curve" smooth="yes"/>
-      <point x="239" y="114"/>
-      <point x="215" y="107"/>
-      <point x="169" y="107" type="curve" smooth="yes"/>
-      <point x="133" y="107"/>
-      <point x="89" y="113"/>
-      <point x="49" y="126" type="curve"/>
-      <point x="19" y="23" type="line"/>
-      <point x="71" y="1"/>
-      <point x="114" y="-6"/>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="300" y="-6"/>
+      <point x="385" y="45"/>
+      <point x="385" y="121" type="curve" smooth="yes"/>
+      <point x="385" y="176"/>
+      <point x="341" y="218"/>
+      <point x="276" y="225" type="curve"/>
+      <point x="255" y="218" type="line"/>
+      <point x="318" y="216"/>
+      <point x="359" y="252"/>
+      <point x="359" y="309" type="curve" smooth="yes"/>
+      <point x="359" y="380"/>
+      <point x="297" y="422"/>
+      <point x="193" y="422" type="curve" smooth="yes"/>
+      <point x="135" y="422"/>
+      <point x="80" y="410"/>
+      <point x="28" y="386" type="curve"/>
+      <point x="58" y="287" type="line"/>
+      <point x="106" y="304"/>
+      <point x="140" y="311"/>
+      <point x="169" y="311" type="curve" smooth="yes"/>
+      <point x="202" y="311"/>
+      <point x="222" y="302"/>
+      <point x="222" y="287" type="curve" smooth="yes"/>
+      <point x="222" y="269"/>
+      <point x="192" y="257"/>
+      <point x="148" y="257" type="curve" smooth="yes"/>
+      <point x="116" y="257" type="line"/>
+      <point x="116" y="162" type="line"/>
+      <point x="148" y="162" type="line" smooth="yes"/>
+      <point x="210" y="162"/>
+      <point x="247" y="149"/>
+      <point x="247" y="130" type="curve" smooth="yes"/>
+      <point x="247" y="114"/>
+      <point x="222" y="105"/>
+      <point x="180" y="105" type="curve" smooth="yes"/>
+      <point x="141" y="105"/>
+      <point x="98" y="112"/>
+      <point x="57" y="126" type="curve"/>
+      <point x="27" y="23" type="line"/>
+      <point x="76" y="3"/>
+      <point x="119" y="-6"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.glif b/src/Cantarell-Bold.ufo/glyphs/three.glif
index 87cca768..ff67d009 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="572"/>
+  <advance width="586"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="240" y="-10" type="curve" smooth="yes"/>
-      <point x="427" y="-10"/>
-      <point x="550" y="71"/>
-      <point x="550" y="194" type="curve" smooth="yes"/>
-      <point x="550" y="290"/>
-      <point x="479" y="360"/>
-      <point x="372" y="370" type="curve"/>
-      <point x="346" y="360" type="line"/>
-      <point x="446" y="359"/>
-      <point x="511" y="422"/>
-      <point x="511" y="518" type="curve" smooth="yes"/>
-      <point x="511" y="634"/>
-      <point x="419" y="704"/>
-      <point x="265" y="704" type="curve" smooth="yes"/>
-      <point x="183" y="704"/>
-      <point x="101" y="684"/>
-      <point x="25" y="643" type="curve"/>
-      <point x="64" y="514" type="line"/>
-      <point x="126" y="541"/>
-      <point x="180" y="556"/>
-      <point x="229" y="556" type="curve" smooth="yes"/>
-      <point x="291" y="556"/>
-      <point x="331" y="532"/>
-      <point x="331" y="492" type="curve" smooth="yes"/>
-      <point x="331" y="446"/>
-      <point x="280" y="415"/>
-      <point x="204" y="415" type="curve" smooth="yes"/>
-      <point x="156" y="415" type="line"/>
-      <point x="156" y="285" type="line"/>
-      <point x="204" y="285" type="line" smooth="yes"/>
-      <point x="305" y="285"/>
-      <point x="370" y="252"/>
-      <point x="370" y="202" type="curve" smooth="yes"/>
-      <point x="370" y="161"/>
-      <point x="326" y="138"/>
-      <point x="247" y="138" type="curve" smooth="yes"/>
-      <point x="186" y="138"/>
-      <point x="118" y="151"/>
-      <point x="60" y="175" type="curve"/>
-      <point x="20" y="40" type="line"/>
-      <point x="94" y="5"/>
-      <point x="158" y="-10"/>
+      <point x="243" y="-10" type="curve" smooth="yes"/>
+      <point x="430" y="-10"/>
+      <point x="553" y="71"/>
+      <point x="553" y="194" type="curve" smooth="yes"/>
+      <point x="553" y="290"/>
+      <point x="482" y="360"/>
+      <point x="375" y="370" type="curve"/>
+      <point x="349" y="360" type="line"/>
+      <point x="449" y="359"/>
+      <point x="514" y="422"/>
+      <point x="514" y="518" type="curve" smooth="yes"/>
+      <point x="514" y="634"/>
+      <point x="422" y="704"/>
+      <point x="268" y="704" type="curve" smooth="yes"/>
+      <point x="186" y="704"/>
+      <point x="104" y="684"/>
+      <point x="28" y="643" type="curve"/>
+      <point x="67" y="514" type="line"/>
+      <point x="129" y="541"/>
+      <point x="183" y="556"/>
+      <point x="232" y="556" type="curve" smooth="yes"/>
+      <point x="294" y="556"/>
+      <point x="334" y="532"/>
+      <point x="334" y="492" type="curve" smooth="yes"/>
+      <point x="334" y="446"/>
+      <point x="283" y="415"/>
+      <point x="207" y="415" type="curve" smooth="yes"/>
+      <point x="159" y="415" type="line"/>
+      <point x="159" y="285" type="line"/>
+      <point x="207" y="285" type="line" smooth="yes"/>
+      <point x="308" y="285"/>
+      <point x="373" y="252"/>
+      <point x="373" y="202" type="curve" smooth="yes"/>
+      <point x="373" y="161"/>
+      <point x="329" y="138"/>
+      <point x="250" y="138" type="curve" smooth="yes"/>
+      <point x="189" y="138"/>
+      <point x="121" y="151"/>
+      <point x="63" y="175" type="curve"/>
+      <point x="23" y="40" type="line"/>
+      <point x="97" y="5"/>
+      <point x="161" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.numr.glif b/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
index 940bb48f..493d7045 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.numr" format="2">
-  <advance width="396"/>
+  <advance width="412"/>
   <outline>
     <component base="three.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.osf.glif b/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
index 70690ea8..19078828 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="560"/>
+  <advance width="582"/>
   <outline>
     <contour>
-      <point x="236" y="-110" type="curve" smooth="yes"/>
-      <point x="419" y="-110"/>
-      <point x="542" y="-29"/>
-      <point x="542" y="94" type="curve" smooth="yes"/>
-      <point x="542" y="187"/>
-      <point x="471" y="260"/>
-      <point x="361" y="270" type="curve"/>
-      <point x="338" y="260" type="line"/>
-      <point x="438" y="259"/>
-      <point x="503" y="325"/>
-      <point x="503" y="418" type="curve" smooth="yes"/>
-      <point x="503" y="534"/>
-      <point x="409" y="604"/>
-      <point x="260" y="604" type="curve" smooth="yes"/>
-      <point x="179" y="604"/>
-      <point x="97" y="584"/>
-      <point x="21" y="543" type="curve"/>
-      <point x="60" y="420" type="line"/>
-      <point x="129" y="450"/>
-      <point x="181" y="462"/>
-      <point x="226" y="462" type="curve" smooth="yes"/>
-      <point x="287" y="462"/>
-      <point x="330" y="435"/>
-      <point x="330" y="395" type="curve" smooth="yes"/>
-      <point x="330" y="345"/>
-      <point x="264" y="312"/>
-      <point x="152" y="312" type="curve"/>
-      <point x="152" y="188" type="line"/>
-      <point x="287" y="188"/>
-      <point x="369" y="152"/>
-      <point x="369" y="96" type="curve" smooth="yes"/>
-      <point x="369" y="56"/>
-      <point x="322" y="32"/>
-      <point x="243" y="32" type="curve" smooth="yes"/>
-      <point x="182" y="32"/>
-      <point x="111" y="46"/>
-      <point x="55" y="71" type="curve"/>
-      <point x="16" y="-60" type="line"/>
-      <point x="90" y="-95"/>
-      <point x="156" y="-110"/>
+      <point x="243" y="-110" type="curve" smooth="yes"/>
+      <point x="426" y="-110"/>
+      <point x="549" y="-29"/>
+      <point x="549" y="94" type="curve" smooth="yes"/>
+      <point x="549" y="187"/>
+      <point x="478" y="260"/>
+      <point x="368" y="270" type="curve"/>
+      <point x="345" y="260" type="line"/>
+      <point x="445" y="259"/>
+      <point x="510" y="325"/>
+      <point x="510" y="418" type="curve" smooth="yes"/>
+      <point x="510" y="534"/>
+      <point x="416" y="604"/>
+      <point x="267" y="604" type="curve" smooth="yes"/>
+      <point x="186" y="604"/>
+      <point x="104" y="584"/>
+      <point x="28" y="543" type="curve"/>
+      <point x="67" y="420" type="line"/>
+      <point x="136" y="450"/>
+      <point x="188" y="462"/>
+      <point x="233" y="462" type="curve" smooth="yes"/>
+      <point x="294" y="462"/>
+      <point x="337" y="435"/>
+      <point x="337" y="395" type="curve" smooth="yes"/>
+      <point x="337" y="345"/>
+      <point x="271" y="312"/>
+      <point x="159" y="312" type="curve"/>
+      <point x="159" y="188" type="line"/>
+      <point x="294" y="188"/>
+      <point x="376" y="152"/>
+      <point x="376" y="96" type="curve" smooth="yes"/>
+      <point x="376" y="56"/>
+      <point x="329" y="32"/>
+      <point x="250" y="32" type="curve" smooth="yes"/>
+      <point x="189" y="32"/>
+      <point x="118" y="46"/>
+      <point x="62" y="71" type="curve"/>
+      <point x="23" y="-60" type="line"/>
+      <point x="97" y="-95"/>
+      <point x="163" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif b/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
index b199875b..9d3bca24 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threeeighths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeeighths" format="2">
-  <advance width="1066"/>
+  <advance width="1098"/>
   <unicode hex="215C"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="396"/>
-    <component base="eight.dnom" xOffset="645"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="eight.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threefifths.glif b/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
index 7f1e0a65..d9839d49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threefifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threefifths" format="2">
-  <advance width="1048"/>
+  <advance width="1080"/>
   <unicode hex="2157"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="396"/>
-    <component base="five.dnom" xOffset="645"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="five.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif 
b/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
index f8a3d122..df62ac2e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threeinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threeinferior" format="2">
-  <advance width="396"/>
+  <advance width="412"/>
   <unicode hex="2083"/>
   <outline>
     <component base="three.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threequarters.glif 
b/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
index bb351025..f73d8e6f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threequarters.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threequarters" format="2">
-  <advance width="1066"/>
+  <advance width="1098"/>
   <unicode hex="00BE"/>
   <outline>
     <component base="three.numr"/>
-    <component base="fraction" xOffset="396"/>
-    <component base="four.dnom" xOffset="645"/>
+    <component base="fraction" xOffset="412"/>
+    <component base="four.dnom" xOffset="661"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif 
b/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
index e2b254d1..a377f0fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/threesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="threesuperior" format="2">
-  <advance width="396"/>
+  <advance width="412"/>
   <unicode hex="00B3"/>
   <outline>
     <component base="three.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
index 54bf3bad..f85b18df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.dnom.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.dnom" format="2">
-  <advance width="401"/>
+  <advance width="417"/>
   <note>
 two
 </note>
   <outline>
     <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="370" y="0" type="line"/>
-      <point x="370" y="119" type="line"/>
-      <point x="199" y="119" type="line"/>
-      <point x="200" y="91" type="line"/>
-      <point x="296" y="132"/>
-      <point x="360" y="212"/>
-      <point x="360" y="289" type="curve" smooth="yes"/>
-      <point x="360" y="369"/>
-      <point x="289" y="422"/>
-      <point x="182" y="422" type="curve" smooth="yes"/>
-      <point x="120" y="422"/>
-      <point x="63" y="405"/>
-      <point x="16" y="371" type="curve"/>
-      <point x="50" y="270" type="line"/>
-      <point x="88" y="291"/>
-      <point x="123" y="303"/>
-      <point x="155" y="303" type="curve" smooth="yes"/>
-      <point x="193" y="303"/>
-      <point x="217" y="287"/>
-      <point x="217" y="267" type="curve" smooth="yes"/>
-      <point x="217" y="218"/>
-      <point x="132" y="152"/>
-      <point x="37" y="98" type="curve"/>
+      <point x="45" y="0" type="line"/>
+      <point x="378" y="0" type="line"/>
+      <point x="378" y="119" type="line"/>
+      <point x="207" y="119" type="line"/>
+      <point x="208" y="91" type="line"/>
+      <point x="304" y="132"/>
+      <point x="368" y="212"/>
+      <point x="368" y="289" type="curve" smooth="yes"/>
+      <point x="368" y="369"/>
+      <point x="297" y="422"/>
+      <point x="190" y="422" type="curve" smooth="yes"/>
+      <point x="124" y="422"/>
+      <point x="67" y="405"/>
+      <point x="24" y="371" type="curve"/>
+      <point x="58" y="270" type="line"/>
+      <point x="98" y="292"/>
+      <point x="133" y="303"/>
+      <point x="163" y="303" type="curve" smooth="yes"/>
+      <point x="200" y="303"/>
+      <point x="225" y="287"/>
+      <point x="225" y="263" type="curve" smooth="yes"/>
+      <point x="225" y="224"/>
+      <point x="157" y="162"/>
+      <point x="45" y="98" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.glif b/src/Cantarell-Bold.ufo/glyphs/two.glif
index 0e319251..4ab6bbda 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two" format="2">
-  <advance width="562"/>
+  <advance width="576"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="42" y="0" type="line"/>
-      <point x="532" y="0" type="line"/>
-      <point x="532" y="150" type="line"/>
-      <point x="246" y="150" type="line"/>
-      <point x="247" y="114" type="line"/>
-      <point x="425" y="244"/>
-      <point x="514" y="368"/>
-      <point x="514" y="489" type="curve" smooth="yes"/>
-      <point x="514" y="619"/>
-      <point x="412" y="704"/>
-      <point x="255" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="83" y="676"/>
-      <point x="16" y="621" type="curve"/>
-      <point x="60" y="494" type="line"/>
-      <point x="116" y="533"/>
-      <point x="171" y="553"/>
-      <point x="221" y="553" type="curve" smooth="yes"/>
-      <point x="290" y="553"/>
-      <point x="334" y="516"/>
-      <point x="334" y="462" type="curve" smooth="yes"/>
-      <point x="334" y="376"/>
-      <point x="223" y="272"/>
-      <point x="42" y="122" type="curve"/>
+      <point x="46" y="0" type="line"/>
+      <point x="536" y="0" type="line"/>
+      <point x="536" y="150" type="line"/>
+      <point x="250" y="150" type="line"/>
+      <point x="251" y="114" type="line"/>
+      <point x="429" y="244"/>
+      <point x="518" y="368"/>
+      <point x="518" y="489" type="curve" smooth="yes"/>
+      <point x="518" y="619"/>
+      <point x="416" y="704"/>
+      <point x="259" y="704" type="curve" smooth="yes"/>
+      <point x="169" y="704"/>
+      <point x="87" y="676"/>
+      <point x="20" y="621" type="curve"/>
+      <point x="64" y="494" type="line"/>
+      <point x="120" y="533"/>
+      <point x="175" y="553"/>
+      <point x="225" y="553" type="curve" smooth="yes"/>
+      <point x="294" y="553"/>
+      <point x="338" y="516"/>
+      <point x="338" y="462" type="curve" smooth="yes"/>
+      <point x="338" y="376"/>
+      <point x="227" y="272"/>
+      <point x="46" y="122" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.numr.glif b/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
index 571509bb..14d09152 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.numr" format="2">
-  <advance width="401"/>
+  <advance width="417"/>
   <outline>
     <component base="two.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.osf.glif b/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
index 6159f54c..d266bb44 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="549"/>
+  <advance width="571"/>
   <outline>
     <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
-      <point x="523" y="145" type="line"/>
-      <point x="234" y="145" type="line"/>
-      <point x="235" y="111" type="line"/>
-      <point x="415" y="200"/>
-      <point x="504" y="310"/>
-      <point x="504" y="412" type="curve" smooth="yes"/>
-      <point x="504" y="524"/>
-      <point x="403" y="598"/>
-      <point x="249" y="598" type="curve" smooth="yes"/>
-      <point x="159" y="598"/>
-      <point x="78" y="574"/>
-      <point x="12" y="527" type="curve"/>
-      <point x="55" y="404" type="line"/>
-      <point x="108" y="435"/>
-      <point x="165" y="453"/>
-      <point x="216" y="453" type="curve" smooth="yes"/>
-      <point x="286" y="453"/>
-      <point x="331" y="425"/>
-      <point x="331" y="386" type="curve" smooth="yes"/>
-      <point x="331" y="316"/>
-      <point x="222" y="226"/>
-      <point x="37" y="118" type="curve"/>
+      <point x="45" y="0" type="line"/>
+      <point x="531" y="0" type="line"/>
+      <point x="531" y="145" type="line"/>
+      <point x="242" y="145" type="line"/>
+      <point x="243" y="111" type="line"/>
+      <point x="423" y="200"/>
+      <point x="512" y="310"/>
+      <point x="512" y="412" type="curve" smooth="yes"/>
+      <point x="512" y="524"/>
+      <point x="411" y="598"/>
+      <point x="257" y="598" type="curve" smooth="yes"/>
+      <point x="167" y="598"/>
+      <point x="86" y="574"/>
+      <point x="20" y="527" type="curve"/>
+      <point x="63" y="404" type="line"/>
+      <point x="116" y="435"/>
+      <point x="173" y="453"/>
+      <point x="224" y="453" type="curve" smooth="yes"/>
+      <point x="293" y="453"/>
+      <point x="339" y="425"/>
+      <point x="339" y="382" type="curve" smooth="yes"/>
+      <point x="339" y="320"/>
+      <point x="242" y="233"/>
+      <point x="45" y="118" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twofifths.glif b/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
index 86a9a718..1809d260 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twofifths.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twofifths" format="2">
-  <advance width="1053"/>
+  <advance width="1085"/>
   <unicode hex="2156"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="401"/>
-    <component base="five.dnom" xOffset="650"/>
+    <component base="fraction" xOffset="417"/>
+    <component base="five.dnom" xOffset="666"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif b/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
index 058c3934..fdaf27c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twoinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twoinferior" format="2">
-  <advance width="401"/>
+  <advance width="417"/>
   <unicode hex="2082"/>
   <outline>
     <component base="two.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif b/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
index 51b38d00..ba559ee8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twosuperior" format="2">
-  <advance width="401"/>
+  <advance width="417"/>
   <unicode hex="00B2"/>
   <outline>
     <component base="two.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/twothirds.glif b/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
index d7841bc9..2b74297e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/twothirds.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="twothirds" format="2">
-  <advance width="1046"/>
+  <advance width="1078"/>
   <unicode hex="2154"/>
   <outline>
     <component base="two.numr"/>
-    <component base="fraction" xOffset="401"/>
-    <component base="three.dnom" xOffset="650"/>
+    <component base="fraction" xOffset="417"/>
+    <component base="three.dnom" xOffset="666"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
index b1b93675..92b6bcbb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.dnom.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.dnom" format="2">
-  <advance width="448"/>
+  <advance width="464"/>
   <note>
 zero
 </note>
-  <anchor x="224" y="206" name="slash"/>
+  <anchor x="232" y="206" name="slash"/>
   <outline>
     <contour>
-      <point x="222" y="-6" type="curve" smooth="yes"/>
-      <point x="344" y="-6"/>
-      <point x="427" y="81"/>
-      <point x="427" y="212" type="curve" smooth="yes"/>
-      <point x="427" y="339"/>
-      <point x="346" y="424"/>
-      <point x="226" y="424" type="curve" smooth="yes"/>
-      <point x="103" y="424"/>
-      <point x="21" y="336"/>
-      <point x="21" y="207" type="curve" smooth="yes"/>
-      <point x="21" y="80"/>
-      <point x="102" y="-6"/>
+      <point x="230" y="-6" type="curve" smooth="yes"/>
+      <point x="352" y="-6"/>
+      <point x="435" y="81"/>
+      <point x="435" y="212" type="curve" smooth="yes"/>
+      <point x="435" y="339"/>
+      <point x="354" y="424"/>
+      <point x="234" y="424" type="curve" smooth="yes"/>
+      <point x="111" y="424"/>
+      <point x="29" y="336"/>
+      <point x="29" y="207" type="curve" smooth="yes"/>
+      <point x="29" y="80"/>
+      <point x="110" y="-6"/>
     </contour>
     <contour>
-      <point x="225" y="111" type="curve" smooth="yes"/>
-      <point x="187" y="111"/>
-      <point x="162" y="151"/>
-      <point x="162" y="212" type="curve" smooth="yes"/>
-      <point x="162" y="269"/>
-      <point x="187" y="306"/>
-      <point x="223" y="306" type="curve" smooth="yes"/>
-      <point x="260" y="306"/>
-      <point x="285" y="266"/>
-      <point x="285" y="206" type="curve" smooth="yes"/>
-      <point x="285" y="150"/>
-      <point x="261" y="111"/>
+      <point x="233" y="111" type="curve" smooth="yes"/>
+      <point x="195" y="111"/>
+      <point x="170" y="151"/>
+      <point x="170" y="212" type="curve" smooth="yes"/>
+      <point x="170" y="269"/>
+      <point x="195" y="306"/>
+      <point x="231" y="306" type="curve" smooth="yes"/>
+      <point x="268" y="306"/>
+      <point x="293" y="266"/>
+      <point x="293" y="206" type="curve" smooth="yes"/>
+      <point x="293" y="150"/>
+      <point x="269" y="111"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif b/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
index 3a65e864..2513c0d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.numr" format="2">
-  <advance width="448"/>
+  <advance width="464"/>
   <outline>
     <component base="zero.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif b/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
index fffab001..457aea07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="635"/>
-  <anchor x="320" y="295" name="slash"/>
+  <advance width="641"/>
+  <anchor x="323" y="295" name="slash"/>
   <outline>
     <contour>
-      <point x="316" y="-8" type="curve" smooth="yes"/>
-      <point x="489" y="-8"/>
-      <point x="608" y="117"/>
-      <point x="608" y="301" type="curve" smooth="yes"/>
-      <point x="608" y="482"/>
-      <point x="491" y="604"/>
-      <point x="321" y="604" type="curve" smooth="yes"/>
-      <point x="146" y="604"/>
-      <point x="27" y="479"/>
-      <point x="27" y="296" type="curve" smooth="yes"/>
-      <point x="27" y="115"/>
-      <point x="144" y="-8"/>
+      <point x="319" y="-8" type="curve" smooth="yes"/>
+      <point x="492" y="-8"/>
+      <point x="611" y="117"/>
+      <point x="611" y="301" type="curve" smooth="yes"/>
+      <point x="611" y="482"/>
+      <point x="494" y="604"/>
+      <point x="324" y="604" type="curve" smooth="yes"/>
+      <point x="149" y="604"/>
+      <point x="30" y="479"/>
+      <point x="30" y="296" type="curve" smooth="yes"/>
+      <point x="30" y="115"/>
+      <point x="147" y="-8"/>
     </contour>
     <contour>
-      <point x="320" y="134" type="curve" smooth="yes"/>
-      <point x="246" y="134"/>
-      <point x="200" y="205"/>
-      <point x="200" y="300" type="curve" smooth="yes"/>
-      <point x="200" y="393"/>
-      <point x="246" y="461"/>
-      <point x="317" y="461" type="curve" smooth="yes"/>
-      <point x="388" y="461"/>
-      <point x="435" y="392"/>
-      <point x="435" y="294" type="curve" smooth="yes"/>
-      <point x="435" y="203"/>
-      <point x="389" y="134"/>
+      <point x="323" y="134" type="curve" smooth="yes"/>
+      <point x="249" y="134"/>
+      <point x="203" y="205"/>
+      <point x="203" y="300" type="curve" smooth="yes"/>
+      <point x="203" y="393"/>
+      <point x="249" y="461"/>
+      <point x="320" y="461" type="curve" smooth="yes"/>
+      <point x="391" y="461"/>
+      <point x="438" y="392"/>
+      <point x="438" y="294" type="curve" smooth="yes"/>
+      <point x="438" y="203"/>
+      <point x="392" y="134"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
index 4e570b7b..8805008c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="635"/>
+  <advance width="641"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="101" yOffset="54"/>
+    <component base="_slash.zero.osf" xOffset="104" yOffset="54"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif b/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
index b45abf62..ccbe2b56 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zeroinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeroinferior" format="2">
-  <advance width="448"/>
+  <advance width="464"/>
   <unicode hex="2080"/>
   <outline>
     <component base="zero.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif b/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
index f5cb0a84..6194b749 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zerosuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerosuperior" format="2">
-  <advance width="448"/>
+  <advance width="464"/>
   <unicode hex="2070"/>
   <outline>
     <component base="zero.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zerothird.glif b/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
index 5d2df1d7..6c27faab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zerothird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zerothird" format="2">
-  <advance width="1093"/>
+  <advance width="1125"/>
   <unicode hex="2189"/>
   <outline>
     <component base="zero.numr"/>
-    <component base="fraction" xOffset="448"/>
-    <component base="three.dnom" xOffset="697"/>
+    <component base="fraction" xOffset="464"/>
+    <component base="three.dnom" xOffset="713"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/blank.glif b/src/Cantarell-Light.ufo/glyphs/blank.glif
index 809261f8..1c05f6c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Light.ufo/glyphs/blank.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="801"/>
+  <advance width="721"/>
   <unicode hex="2423"/>
   <note>
 uni2423
 </note>
   <outline>
     <contour>
-      <point x="144" y="0" type="line"/>
-      <point x="657" y="0" type="line"/>
-      <point x="657" y="116" type="line"/>
-      <point x="637" y="116" type="line"/>
-      <point x="637" y="17" type="line"/>
-      <point x="164" y="17" type="line"/>
-      <point x="164" y="116" type="line"/>
-      <point x="144" y="116" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="617" y="0" type="line"/>
+      <point x="617" y="116" type="line"/>
+      <point x="597" y="116" type="line"/>
+      <point x="597" y="17" type="line"/>
+      <point x="124" y="17" type="line"/>
+      <point x="124" y="116" type="line"/>
+      <point x="104" y="116" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
index 43eef923..c72b086e 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="582"/>
+  <advance width="541"/>
   <outline>
     <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="513" y="57"/>
-      <point x="513" y="163" type="curve" smooth="yes"/>
-      <point x="513" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="283" y="687" type="curve" smooth="yes"/>
-      <point x="381" y="687"/>
-      <point x="456" y="628"/>
-      <point x="456" y="543" type="curve" smooth="yes"/>
-      <point x="456" y="460"/>
-      <point x="384" y="397"/>
-      <point x="275" y="369" type="curve"/>
-      <point x="291" y="358" type="line"/>
-      <point x="404" y="385"/>
-      <point x="475" y="454"/>
-      <point x="475" y="543" type="curve" smooth="yes"/>
-      <point x="475" y="639"/>
-      <point x="394" y="704"/>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="493" y="372"/>
-      <point x="493" y="161" type="curve" smooth="yes"/>
-      <point x="493" y="67"/>
-      <point x="416" y="7"/>
-      <point x="298" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="275" y="352" type="curve"/>
-      <point x="259" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="405" y="-10"/>
+      <point x="492" y="57"/>
+      <point x="492" y="163" type="curve" smooth="yes"/>
+      <point x="492" y="389"/>
+      <point x="97" y="324"/>
+      <point x="97" y="540" type="curve" smooth="yes"/>
+      <point x="97" y="629"/>
+      <point x="164" y="687"/>
+      <point x="262" y="687" type="curve" smooth="yes"/>
+      <point x="360" y="687"/>
+      <point x="435" y="628"/>
+      <point x="435" y="543" type="curve" smooth="yes"/>
+      <point x="435" y="460"/>
+      <point x="363" y="397"/>
+      <point x="254" y="369" type="curve"/>
+      <point x="270" y="358" type="line"/>
+      <point x="383" y="385"/>
+      <point x="454" y="454"/>
+      <point x="454" y="543" type="curve" smooth="yes"/>
+      <point x="454" y="639"/>
+      <point x="373" y="704"/>
+      <point x="264" y="704" type="curve" smooth="yes"/>
+      <point x="154" y="704"/>
+      <point x="78" y="639"/>
+      <point x="78" y="538" type="curve" smooth="yes"/>
+      <point x="78" y="307"/>
+      <point x="472" y="372"/>
+      <point x="472" y="161" type="curve" smooth="yes"/>
+      <point x="472" y="67"/>
+      <point x="395" y="7"/>
+      <point x="277" y="7" type="curve" smooth="yes"/>
+      <point x="156" y="7"/>
+      <point x="73" y="71"/>
+      <point x="73" y="166" type="curve" smooth="yes"/>
+      <point x="73" y="254"/>
+      <point x="145" y="325"/>
+      <point x="254" y="352" type="curve"/>
+      <point x="238" y="363" type="line"/>
+      <point x="127" y="338"/>
+      <point x="53" y="260"/>
+      <point x="53" y="164" type="curve" smooth="yes"/>
+      <point x="53" y="60"/>
+      <point x="142" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/five.osf.glif b/src/Cantarell-Light.ufo/glyphs/five.osf.glif
index f78453f9..4b77fdfb 100644
--- a/src/Cantarell-Light.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="542"/>
+  <advance width="503"/>
   <outline>
     <contour>
-      <point x="251" y="-110" type="curve" smooth="yes"/>
-      <point x="389" y="-110"/>
-      <point x="475" y="-20"/>
-      <point x="475" y="103" type="curve" smooth="yes"/>
-      <point x="475" y="226"/>
-      <point x="388" y="303"/>
-      <point x="243" y="303" type="curve" smooth="yes"/>
-      <point x="206" y="303"/>
-      <point x="156" y="298"/>
-      <point x="106" y="288" type="curve"/>
-      <point x="118" y="284" type="line"/>
-      <point x="131" y="577" type="line"/>
-      <point x="446" y="577" type="line"/>
-      <point x="446" y="594" type="line"/>
-      <point x="113" y="594" type="line"/>
-      <point x="97" y="269" type="line"/>
-      <point x="143" y="279"/>
-      <point x="195" y="285"/>
-      <point x="236" y="285" type="curve" smooth="yes"/>
-      <point x="380" y="285"/>
-      <point x="454" y="210"/>
-      <point x="454" y="101" type="curve" smooth="yes"/>
-      <point x="454" y="-12"/>
-      <point x="376" y="-91"/>
-      <point x="255" y="-91" type="curve" smooth="yes"/>
-      <point x="193" y="-91"/>
-      <point x="121" y="-71"/>
-      <point x="76" y="-42" type="curve"/>
-      <point x="70" y="-59" type="line"/>
-      <point x="120" y="-91"/>
-      <point x="187" y="-110"/>
+      <point x="231" y="-110" type="curve" smooth="yes"/>
+      <point x="369" y="-110"/>
+      <point x="455" y="-20"/>
+      <point x="455" y="103" type="curve" smooth="yes"/>
+      <point x="455" y="226"/>
+      <point x="368" y="303"/>
+      <point x="223" y="303" type="curve" smooth="yes"/>
+      <point x="186" y="303"/>
+      <point x="136" y="298"/>
+      <point x="86" y="288" type="curve"/>
+      <point x="98" y="284" type="line"/>
+      <point x="111" y="577" type="line"/>
+      <point x="426" y="577" type="line"/>
+      <point x="426" y="594" type="line"/>
+      <point x="93" y="594" type="line"/>
+      <point x="77" y="269" type="line"/>
+      <point x="123" y="279"/>
+      <point x="175" y="285"/>
+      <point x="216" y="285" type="curve" smooth="yes"/>
+      <point x="360" y="285"/>
+      <point x="434" y="210"/>
+      <point x="434" y="101" type="curve" smooth="yes"/>
+      <point x="434" y="-12"/>
+      <point x="356" y="-91"/>
+      <point x="235" y="-91" type="curve" smooth="yes"/>
+      <point x="173" y="-91"/>
+      <point x="101" y="-71"/>
+      <point x="56" y="-42" type="curve"/>
+      <point x="50" y="-59" type="line"/>
+      <point x="100" y="-91"/>
+      <point x="167" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.osf.glif b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
index a09bbe17..15592e0f 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="568"/>
+  <advance width="543"/>
   <outline>
     <contour>
-      <point x="393" y="-110" type="line"/>
-      <point x="411" y="-110" type="line"/>
-      <point x="411" y="594" type="line"/>
-      <point x="394" y="594" type="line"/>
-      <point x="37" y="100" type="line"/>
-      <point x="37" y="90" type="line"/>
-      <point x="533" y="90" type="line"/>
-      <point x="533" y="107" type="line"/>
-      <point x="59" y="107" type="line"/>
-      <point x="59" y="102" type="line"/>
-      <point x="393" y="567" type="line"/>
-      <point x="393" y="565" type="line"/>
+      <point x="380" y="-110" type="line"/>
+      <point x="398" y="-110" type="line"/>
+      <point x="398" y="594" type="line"/>
+      <point x="381" y="594" type="line"/>
+      <point x="24" y="100" type="line"/>
+      <point x="24" y="90" type="line"/>
+      <point x="520" y="90" type="line"/>
+      <point x="520" y="107" type="line"/>
+      <point x="46" y="107" type="line"/>
+      <point x="46" y="102" type="line"/>
+      <point x="380" y="567" type="line"/>
+      <point x="380" y="565" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/germandbls.glif b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
index f3653449..bdfef279 100644
--- a/src/Cantarell-Light.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
@@ -1,49 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="germandbls" format="2">
-  <advance width="570"/>
+  <advance width="556"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="357" y="-10" type="curve" smooth="yes"/>
-      <point x="448" y="-10"/>
-      <point x="513" y="44"/>
-      <point x="513" y="134" type="curve" smooth="yes"/>
-      <point x="513" y="290"/>
-      <point x="315" y="292"/>
-      <point x="315" y="384" type="curve" smooth="yes"/>
-      <point x="315" y="457"/>
-      <point x="438" y="464"/>
-      <point x="438" y="591" type="curve" smooth="yes"/>
-      <point x="438" y="685"/>
-      <point x="371" y="749"/>
-      <point x="277" y="749" type="curve" smooth="yes"/>
-      <point x="169" y="749"/>
-      <point x="102" y="664"/>
-      <point x="102" y="539" type="curve" smooth="yes"/>
-      <point x="102" y="0" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="123" y="548" type="line" smooth="yes"/>
-      <point x="123" y="659"/>
-      <point x="181" y="731"/>
-      <point x="274" y="731" type="curve" smooth="yes"/>
-      <point x="357" y="731"/>
-      <point x="418" y="673"/>
-      <point x="418" y="588" type="curve" smooth="yes"/>
-      <point x="418" y="468"/>
-      <point x="294" y="465"/>
-      <point x="294" y="381" type="curve" smooth="yes"/>
-      <point x="294" y="275"/>
-      <point x="492" y="281"/>
-      <point x="492" y="131" type="curve" smooth="yes"/>
-      <point x="492" y="54"/>
-      <point x="438" y="8"/>
-      <point x="359" y="8" type="curve" smooth="yes"/>
-      <point x="316" y="8"/>
-      <point x="266" y="21"/>
-      <point x="225" y="43" type="curve"/>
-      <point x="219" y="26" type="line"/>
-      <point x="257" y="4"/>
-      <point x="311" y="-10"/>
+      <point x="343" y="-10" type="curve" smooth="yes"/>
+      <point x="434" y="-10"/>
+      <point x="499" y="44"/>
+      <point x="499" y="134" type="curve" smooth="yes"/>
+      <point x="499" y="290"/>
+      <point x="301" y="292"/>
+      <point x="301" y="384" type="curve" smooth="yes"/>
+      <point x="301" y="457"/>
+      <point x="424" y="464"/>
+      <point x="424" y="591" type="curve" smooth="yes"/>
+      <point x="424" y="685"/>
+      <point x="357" y="749"/>
+      <point x="263" y="749" type="curve" smooth="yes"/>
+      <point x="155" y="749"/>
+      <point x="88" y="664"/>
+      <point x="88" y="539" type="curve" smooth="yes"/>
+      <point x="88" y="0" type="line"/>
+      <point x="109" y="0" type="line"/>
+      <point x="109" y="548" type="line" smooth="yes"/>
+      <point x="109" y="659"/>
+      <point x="167" y="731"/>
+      <point x="260" y="731" type="curve" smooth="yes"/>
+      <point x="343" y="731"/>
+      <point x="404" y="673"/>
+      <point x="404" y="588" type="curve" smooth="yes"/>
+      <point x="404" y="468"/>
+      <point x="280" y="465"/>
+      <point x="280" y="381" type="curve" smooth="yes"/>
+      <point x="280" y="275"/>
+      <point x="478" y="281"/>
+      <point x="478" y="131" type="curve" smooth="yes"/>
+      <point x="478" y="54"/>
+      <point x="424" y="8"/>
+      <point x="345" y="8" type="curve" smooth="yes"/>
+      <point x="302" y="8"/>
+      <point x="252" y="21"/>
+      <point x="211" y="43" type="curve"/>
+      <point x="205" y="26" type="line"/>
+      <point x="243" y="4"/>
+      <point x="297" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index e36b414d..9cc88559 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -789,7 +789,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bar</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
-      <integer>0</integer>
+      <integer>11</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blackCircle</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blank</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/micro.glif b/src/Cantarell-Light.ufo/glyphs/micro.glif
index 2db1666e..cd7b57a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="619"/>
+  <advance width="527"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="303" y="-6" type="curve" smooth="yes"/>
-      <point x="379" y="-6"/>
-      <point x="446" y="31"/>
-      <point x="490" y="96" type="curve"/>
-      <point x="483" y="107" type="line"/>
-      <point x="440" y="46"/>
-      <point x="377" y="12"/>
-      <point x="308" y="12" type="curve" smooth="yes"/>
-      <point x="217" y="12"/>
-      <point x="164" y="69"/>
-      <point x="164" y="166" type="curve"/>
-      <point x="144" y="184" type="line"/>
-      <point x="144" y="55"/>
-      <point x="207" y="-6"/>
+      <point x="247" y="-6" type="curve" smooth="yes"/>
+      <point x="323" y="-6"/>
+      <point x="390" y="31"/>
+      <point x="434" y="96" type="curve"/>
+      <point x="427" y="107" type="line"/>
+      <point x="384" y="46"/>
+      <point x="321" y="12"/>
+      <point x="252" y="12" type="curve" smooth="yes"/>
+      <point x="161" y="12"/>
+      <point x="108" y="69"/>
+      <point x="108" y="166" type="curve"/>
+      <point x="88" y="184" type="line"/>
+      <point x="88" y="55"/>
+      <point x="151" y="-6"/>
     </contour>
     <contour>
-      <point x="144" y="-217" type="line"/>
-      <point x="164" y="-217" type="line"/>
-      <point x="164" y="482" type="line"/>
-      <point x="144" y="482" type="line"/>
+      <point x="88" y="-217" type="line"/>
+      <point x="108" y="-217" type="line"/>
+      <point x="108" y="482" type="line"/>
+      <point x="88" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="495" y="0" type="line"/>
-      <point x="495" y="480" type="line"/>
-      <point x="474" y="480" type="line"/>
-      <point x="474" y="76" type="line"/>
+      <point x="422" y="0" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="439" y="480" type="line"/>
+      <point x="418" y="480" type="line"/>
+      <point x="418" y="76" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
index 884ca403..78db8a4a 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="585"/>
+  <advance width="546"/>
   <outline>
     <contour>
-      <point x="274" y="604" type="curve" smooth="yes"/>
-      <point x="154" y="604"/>
-      <point x="72" y="517"/>
-      <point x="72" y="388" type="curve" smooth="yes"/>
-      <point x="72" y="261"/>
-      <point x="152" y="184"/>
-      <point x="271" y="184" type="curve" smooth="yes"/>
-      <point x="368" y="184"/>
-      <point x="444" y="233"/>
-      <point x="490" y="324" type="curve"/>
-      <point x="490" y="355" type="line"/>
-      <point x="446" y="257"/>
-      <point x="369" y="202"/>
-      <point x="273" y="202" type="curve" smooth="yes"/>
-      <point x="167" y="202"/>
-      <point x="93" y="272"/>
-      <point x="93" y="391" type="curve" smooth="yes"/>
-      <point x="93" y="508"/>
-      <point x="165" y="586"/>
-      <point x="273" y="586" type="curve" smooth="yes"/>
-      <point x="405" y="586"/>
-      <point x="481" y="469"/>
-      <point x="481" y="272" type="curve" smooth="yes"/>
-      <point x="481" y="34"/>
-      <point x="394" y="-92"/>
-      <point x="230" y="-92" type="curve" smooth="yes"/>
-      <point x="179" y="-92"/>
-      <point x="129" y="-79"/>
-      <point x="91" y="-56" type="curve"/>
-      <point x="84" y="-73" type="line"/>
-      <point x="125" y="-97"/>
-      <point x="174" y="-110"/>
-      <point x="228" y="-110" type="curve" smooth="yes"/>
-      <point x="407" y="-110"/>
-      <point x="502" y="24"/>
-      <point x="502" y="275" type="curve" smooth="yes"/>
-      <point x="502" y="481"/>
-      <point x="418" y="604"/>
+      <point x="254" y="604" type="curve" smooth="yes"/>
+      <point x="134" y="604"/>
+      <point x="52" y="517"/>
+      <point x="52" y="388" type="curve" smooth="yes"/>
+      <point x="52" y="261"/>
+      <point x="132" y="184"/>
+      <point x="251" y="184" type="curve" smooth="yes"/>
+      <point x="348" y="184"/>
+      <point x="424" y="233"/>
+      <point x="470" y="324" type="curve"/>
+      <point x="470" y="355" type="line"/>
+      <point x="426" y="257"/>
+      <point x="349" y="202"/>
+      <point x="253" y="202" type="curve" smooth="yes"/>
+      <point x="147" y="202"/>
+      <point x="73" y="272"/>
+      <point x="73" y="391" type="curve" smooth="yes"/>
+      <point x="73" y="508"/>
+      <point x="145" y="586"/>
+      <point x="253" y="586" type="curve" smooth="yes"/>
+      <point x="385" y="586"/>
+      <point x="461" y="469"/>
+      <point x="461" y="272" type="curve" smooth="yes"/>
+      <point x="461" y="34"/>
+      <point x="374" y="-92"/>
+      <point x="210" y="-92" type="curve" smooth="yes"/>
+      <point x="159" y="-92"/>
+      <point x="109" y="-79"/>
+      <point x="71" y="-56" type="curve"/>
+      <point x="64" y="-73" type="line"/>
+      <point x="105" y="-97"/>
+      <point x="154" y="-110"/>
+      <point x="208" y="-110" type="curve" smooth="yes"/>
+      <point x="387" y="-110"/>
+      <point x="482" y="24"/>
+      <point x="482" y="275" type="curve" smooth="yes"/>
+      <point x="482" y="481"/>
+      <point x="398" y="604"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.dnom.glif b/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
index 513eaac5..f8aec065 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.dnom.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="272"/>
+  <advance width="230"/>
   <note>
 one
 </note>
   <outline>
     <contour>
-      <point x="163" y="-2" type="line"/>
-      <point x="184" y="-2" type="line"/>
-      <point x="184" y="416" type="line"/>
-      <point x="171" y="416" type="line"/>
-      <point x="27" y="343" type="line"/>
-      <point x="35" y="328" type="line"/>
-      <point x="171" y="393" type="line"/>
-      <point x="163" y="399" type="line"/>
+      <point x="138" y="-2" type="line"/>
+      <point x="159" y="-2" type="line"/>
+      <point x="159" y="416" type="line"/>
+      <point x="146" y="416" type="line"/>
+      <point x="2" y="343" type="line"/>
+      <point x="10" y="328" type="line"/>
+      <point x="146" y="393" type="line"/>
+      <point x="138" y="399" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.numr.glif b/src/Cantarell-Light.ufo/glyphs/one.numr.glif
index f735e70a..03026a02 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="272"/>
+  <advance width="230"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.osf.glif b/src/Cantarell-Light.ufo/glyphs/one.osf.glif
index 940e274f..6446b4b6 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.osf.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="337"/>
+  <advance width="348"/>
   <outline>
     <contour>
       <point x="218" y="-2" type="line"/>
@@ -13,4 +13,12 @@
       <point x="218" y="577" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneeighth.glif b/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
index 13788b72..68faf138 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="830"/>
+  <advance width="788"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="eight.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="eight.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onefifth.glif b/src/Cantarell-Light.ufo/glyphs/onefifth.glif
index f85d5e42..48006bfc 100644
--- a/src/Cantarell-Light.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="804"/>
+  <advance width="762"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="five.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="five.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onefraction.glif b/src/Cantarell-Light.ufo/glyphs/onefraction.glif
index 287b9478..26f166b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="437"/>
+  <advance width="395"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
+    <component base="fraction" xOffset="230"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onehalf.glif b/src/Cantarell-Light.ufo/glyphs/onehalf.glif
index cbc2250e..6becd0c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="777"/>
+  <advance width="735"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="two.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="two.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneinferior.glif b/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
index dcb6f28e..ee3137b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="272"/>
+  <advance width="230"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneninth.glif b/src/Cantarell-Light.ufo/glyphs/oneninth.glif
index 605550ba..0b44d956 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="832"/>
+  <advance width="790"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="nine.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="nine.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onequarter.glif b/src/Cantarell-Light.ufo/glyphs/onequarter.glif
index 3685c832..d7ed535d 100644
--- a/src/Cantarell-Light.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="816"/>
+  <advance width="774"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="four.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="four.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oneseventh.glif b/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
index e0d7fdd8..84f62796 100644
--- a/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="762"/>
+  <advance width="720"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="seven.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="seven.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onesixth.glif b/src/Cantarell-Light.ufo/glyphs/onesixth.glif
index 0e25c998..aab744d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="832"/>
+  <advance width="790"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="six.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="six.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onesuperior.glif b/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
index 6991f466..91f99ba8 100644
--- a/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="272"/>
+  <advance width="230"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/onetenth.glif b/src/Cantarell-Light.ufo/glyphs/onetenth.glif
index e9eaef90..2251a253 100644
--- a/src/Cantarell-Light.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1119"/>
+  <advance width="1035"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="one.dnom" xOffset="437"/>
-    <component base="zero.dnom" xOffset="709"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="one.dnom" xOffset="395"/>
+    <component base="zero.dnom" xOffset="625"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/onethird.glif b/src/Cantarell-Light.ufo/glyphs/onethird.glif
index 83af7616..7477d671 100644
--- a/src/Cantarell-Light.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Light.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="809"/>
+  <advance width="767"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="272"/>
-    <component base="three.dnom" xOffset="437"/>
+    <component base="fraction" xOffset="230"/>
+    <component base="three.dnom" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/paragraph.glif b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
index 92caa569..d480eaf1 100644
--- a/src/Cantarell-Light.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="678"/>
+  <advance width="598"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="309" y="-162" type="line"/>
-      <point x="328" y="-162" type="line"/>
-      <point x="328" y="677" type="line"/>
-      <point x="515" y="677" type="line"/>
-      <point x="515" y="-162" type="line"/>
-      <point x="534" y="-162" type="line"/>
-      <point x="534" y="694" type="line"/>
-      <point x="309" y="694" type="line" smooth="yes"/>
-      <point x="178" y="694"/>
-      <point x="90" y="615"/>
-      <point x="90" y="497" type="curve" smooth="yes"/>
-      <point x="90" y="375"/>
-      <point x="178" y="293"/>
-      <point x="309" y="293" type="curve"/>
+      <point x="269" y="-162" type="line"/>
+      <point x="288" y="-162" type="line"/>
+      <point x="288" y="677" type="line"/>
+      <point x="475" y="677" type="line"/>
+      <point x="475" y="-162" type="line"/>
+      <point x="494" y="-162" type="line"/>
+      <point x="494" y="694" type="line"/>
+      <point x="269" y="694" type="line" smooth="yes"/>
+      <point x="138" y="694"/>
+      <point x="50" y="615"/>
+      <point x="50" y="497" type="curve" smooth="yes"/>
+      <point x="50" y="375"/>
+      <point x="138" y="293"/>
+      <point x="269" y="293" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/perthousand.glif b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
index e3b04230..d1db595e 100644
--- a/src/Cantarell-Light.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1296"/>
+  <advance width="1297"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
@@ -94,4 +94,12 @@
       <point x="1131" y="10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/product.glif b/src/Cantarell-Light.ufo/glyphs/product.glif
index f5bcca10..96f2f5e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/product.glif
+++ b/src/Cantarell-Light.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="762"/>
+  <advance width="682"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="144" y="-95" type="line"/>
-      <point x="164" y="-95" type="line"/>
-      <point x="164" y="676" type="line"/>
-      <point x="598" y="676" type="line"/>
-      <point x="598" y="-95" type="line"/>
-      <point x="618" y="-95" type="line"/>
-      <point x="618" y="694" type="line"/>
-      <point x="144" y="694" type="line"/>
+      <point x="104" y="-95" type="line"/>
+      <point x="124" y="-95" type="line"/>
+      <point x="124" y="676" type="line"/>
+      <point x="558" y="676" type="line"/>
+      <point x="558" y="-95" type="line"/>
+      <point x="578" y="-95" type="line"/>
+      <point x="578" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
index 04381976..246d565c 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="521"/>
+  <advance width="483"/>
   <outline>
     <contour>
-      <point x="157" y="-100" type="line"/>
-      <point x="180" y="-100" type="line"/>
-      <point x="471" y="582" type="line"/>
-      <point x="471" y="594" type="line"/>
-      <point x="44" y="594" type="line"/>
-      <point x="44" y="576" type="line"/>
-      <point x="454" y="576" type="line"/>
-      <point x="451" y="585" type="line"/>
+      <point x="138" y="-100" type="line"/>
+      <point x="161" y="-100" type="line"/>
+      <point x="452" y="582" type="line"/>
+      <point x="452" y="594" type="line"/>
+      <point x="25" y="594" type="line"/>
+      <point x="25" y="576" type="line"/>
+      <point x="435" y="576" type="line"/>
+      <point x="432" y="585" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.osf.glif b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
index 66285990..b01eead4 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="586"/>
+  <advance width="546"/>
   <outline>
     <contour>
-      <point x="312" y="-10" type="curve" smooth="yes"/>
-      <point x="432" y="-10"/>
-      <point x="514" y="77"/>
-      <point x="514" y="206" type="curve" smooth="yes"/>
-      <point x="514" y="333"/>
-      <point x="434" y="410"/>
-      <point x="315" y="410" type="curve" smooth="yes"/>
-      <point x="218" y="410"/>
-      <point x="142" y="361"/>
-      <point x="96" y="270" type="curve"/>
-      <point x="96" y="239" type="line"/>
-      <point x="140" y="337"/>
-      <point x="217" y="392"/>
-      <point x="313" y="392" type="curve" smooth="yes"/>
-      <point x="419" y="392"/>
-      <point x="493" y="322"/>
-      <point x="493" y="203" type="curve" smooth="yes"/>
-      <point x="493" y="86"/>
-      <point x="421" y="8"/>
-      <point x="313" y="8" type="curve" smooth="yes"/>
-      <point x="181" y="8"/>
-      <point x="105" y="125"/>
-      <point x="105" y="322" type="curve" smooth="yes"/>
-      <point x="105" y="560"/>
-      <point x="192" y="686"/>
-      <point x="356" y="686" type="curve" smooth="yes"/>
-      <point x="407" y="686"/>
-      <point x="457" y="673"/>
-      <point x="495" y="650" type="curve"/>
-      <point x="502" y="667" type="line"/>
-      <point x="461" y="691"/>
-      <point x="412" y="704"/>
-      <point x="358" y="704" type="curve" smooth="yes"/>
-      <point x="179" y="704"/>
-      <point x="84" y="570"/>
-      <point x="84" y="319" type="curve" smooth="yes"/>
-      <point x="84" y="113"/>
-      <point x="168" y="-10"/>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="412" y="-10"/>
+      <point x="494" y="77"/>
+      <point x="494" y="206" type="curve" smooth="yes"/>
+      <point x="494" y="333"/>
+      <point x="414" y="410"/>
+      <point x="295" y="410" type="curve" smooth="yes"/>
+      <point x="198" y="410"/>
+      <point x="122" y="361"/>
+      <point x="76" y="270" type="curve"/>
+      <point x="76" y="239" type="line"/>
+      <point x="120" y="337"/>
+      <point x="197" y="392"/>
+      <point x="293" y="392" type="curve" smooth="yes"/>
+      <point x="399" y="392"/>
+      <point x="473" y="322"/>
+      <point x="473" y="203" type="curve" smooth="yes"/>
+      <point x="473" y="86"/>
+      <point x="401" y="8"/>
+      <point x="293" y="8" type="curve" smooth="yes"/>
+      <point x="161" y="8"/>
+      <point x="85" y="125"/>
+      <point x="85" y="322" type="curve" smooth="yes"/>
+      <point x="85" y="560"/>
+      <point x="172" y="686"/>
+      <point x="336" y="686" type="curve" smooth="yes"/>
+      <point x="387" y="686"/>
+      <point x="437" y="673"/>
+      <point x="475" y="650" type="curve"/>
+      <point x="482" y="667" type="line"/>
+      <point x="441" y="691"/>
+      <point x="392" y="704"/>
+      <point x="338" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="64" y="570"/>
+      <point x="64" y="319" type="curve" smooth="yes"/>
+      <point x="64" y="113"/>
+      <point x="148" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.osf.glif b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
index ce239bfc..743c86e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="566"/>
+  <advance width="530"/>
   <outline>
     <contour>
-      <point x="268" y="-110" type="curve" smooth="yes"/>
-      <point x="407" y="-110"/>
-      <point x="496" y="-40"/>
-      <point x="496" y="70" type="curve" smooth="yes"/>
-      <point x="496" y="175"/>
-      <point x="416" y="240"/>
-      <point x="267" y="256" type="curve"/>
-      <point x="267" y="252" type="line"/>
-      <point x="382" y="259"/>
-      <point x="458" y="329"/>
-      <point x="458" y="428" type="curve" smooth="yes"/>
-      <point x="458" y="532"/>
-      <point x="376" y="604"/>
-      <point x="257" y="604" type="curve" smooth="yes"/>
-      <point x="191" y="604"/>
-      <point x="126" y="583"/>
-      <point x="72" y="545" type="curve"/>
-      <point x="77" y="529" type="line"/>
-      <point x="139" y="568"/>
-      <point x="195" y="586"/>
-      <point x="253" y="586" type="curve" smooth="yes"/>
-      <point x="363" y="586"/>
-      <point x="437" y="524"/>
-      <point x="437" y="424" type="curve" smooth="yes"/>
-      <point x="437" y="316"/>
-      <point x="353" y="261"/>
-      <point x="188" y="261" type="curve"/>
-      <point x="188" y="244" type="line"/>
-      <point x="373" y="244"/>
-      <point x="476" y="181"/>
-      <point x="476" y="68" type="curve" smooth="yes"/>
-      <point x="476" y="-31"/>
-      <point x="397" y="-91"/>
-      <point x="269" y="-91" type="curve" smooth="yes"/>
-      <point x="197" y="-91"/>
-      <point x="119" y="-71"/>
-      <point x="58" y="-37" type="curve"/>
-      <point x="53" y="-55" type="line"/>
-      <point x="112" y="-89"/>
-      <point x="193" y="-110"/>
+      <point x="249" y="-110" type="curve" smooth="yes"/>
+      <point x="388" y="-110"/>
+      <point x="477" y="-40"/>
+      <point x="477" y="70" type="curve" smooth="yes"/>
+      <point x="477" y="175"/>
+      <point x="397" y="240"/>
+      <point x="248" y="256" type="curve"/>
+      <point x="248" y="252" type="line"/>
+      <point x="363" y="259"/>
+      <point x="439" y="329"/>
+      <point x="439" y="428" type="curve" smooth="yes"/>
+      <point x="439" y="532"/>
+      <point x="357" y="604"/>
+      <point x="238" y="604" type="curve" smooth="yes"/>
+      <point x="172" y="604"/>
+      <point x="107" y="583"/>
+      <point x="53" y="545" type="curve"/>
+      <point x="58" y="529" type="line"/>
+      <point x="120" y="568"/>
+      <point x="176" y="586"/>
+      <point x="234" y="586" type="curve" smooth="yes"/>
+      <point x="344" y="586"/>
+      <point x="418" y="524"/>
+      <point x="418" y="424" type="curve" smooth="yes"/>
+      <point x="418" y="316"/>
+      <point x="334" y="261"/>
+      <point x="169" y="261" type="curve"/>
+      <point x="169" y="244" type="line"/>
+      <point x="354" y="244"/>
+      <point x="457" y="181"/>
+      <point x="457" y="68" type="curve" smooth="yes"/>
+      <point x="457" y="-31"/>
+      <point x="378" y="-91"/>
+      <point x="250" y="-91" type="curve" smooth="yes"/>
+      <point x="178" y="-91"/>
+      <point x="100" y="-71"/>
+      <point x="39" y="-37" type="curve"/>
+      <point x="34" y="-55" type="line"/>
+      <point x="93" y="-89"/>
+      <point x="174" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/two.osf.glif b/src/Cantarell-Light.ufo/glyphs/two.osf.glif
index 0a2b21b3..15aa8b35 100644
--- a/src/Cantarell-Light.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="508"/>
+  <advance width="469"/>
   <outline>
     <contour>
-      <point x="53" y="0" type="line"/>
-      <point x="449" y="0" type="line"/>
-      <point x="449" y="17" type="line"/>
-      <point x="73" y="17" type="line"/>
-      <point x="77" y="10" type="line"/>
-      <point x="367" y="264"/>
-      <point x="423" y="347"/>
-      <point x="423" y="437" type="curve" smooth="yes"/>
-      <point x="423" y="540"/>
-      <point x="348" y="604"/>
-      <point x="230" y="604" type="curve" smooth="yes"/>
-      <point x="161" y="604"/>
-      <point x="100" y="583"/>
-      <point x="53" y="539" type="curve"/>
-      <point x="62" y="526" type="line"/>
-      <point x="111" y="566"/>
-      <point x="164" y="586"/>
-      <point x="226" y="586" type="curve" smooth="yes"/>
-      <point x="333" y="586"/>
-      <point x="402" y="527"/>
-      <point x="402" y="434" type="curve" smooth="yes"/>
-      <point x="402" y="348"/>
-      <point x="345" y="266"/>
-      <point x="53" y="9" type="curve"/>
+      <point x="34" y="0" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="430" y="17" type="line"/>
+      <point x="54" y="17" type="line"/>
+      <point x="58" y="10" type="line"/>
+      <point x="348" y="264"/>
+      <point x="404" y="347"/>
+      <point x="404" y="437" type="curve" smooth="yes"/>
+      <point x="404" y="540"/>
+      <point x="329" y="604"/>
+      <point x="211" y="604" type="curve" smooth="yes"/>
+      <point x="142" y="604"/>
+      <point x="81" y="583"/>
+      <point x="34" y="539" type="curve"/>
+      <point x="43" y="526" type="line"/>
+      <point x="92" y="566"/>
+      <point x="145" y="586"/>
+      <point x="207" y="586" type="curve" smooth="yes"/>
+      <point x="314" y="586"/>
+      <point x="383" y="527"/>
+      <point x="383" y="434" type="curve" smooth="yes"/>
+      <point x="383" y="348"/>
+      <point x="326" y="266"/>
+      <point x="34" y="9" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
index 813daac2..1b6f97e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="601"/>
-  <anchor x="309" y="300" name="slash"/>
+  <advance width="563"/>
+  <anchor x="290" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="300" y="-9" type="curve" smooth="yes"/>
-      <point x="431" y="-9"/>
-      <point x="518" y="112"/>
-      <point x="518" y="294" type="curve" smooth="yes"/>
-      <point x="518" y="477"/>
-      <point x="432" y="599"/>
-      <point x="304" y="599" type="curve" smooth="yes"/>
-      <point x="171" y="599"/>
-      <point x="83" y="476"/>
-      <point x="83" y="291" type="curve" smooth="yes"/>
-      <point x="83" y="111"/>
-      <point x="170" y="-9"/>
+      <point x="281" y="-9" type="curve" smooth="yes"/>
+      <point x="412" y="-9"/>
+      <point x="499" y="112"/>
+      <point x="499" y="294" type="curve" smooth="yes"/>
+      <point x="499" y="477"/>
+      <point x="413" y="599"/>
+      <point x="285" y="599" type="curve" smooth="yes"/>
+      <point x="152" y="599"/>
+      <point x="64" y="476"/>
+      <point x="64" y="291" type="curve" smooth="yes"/>
+      <point x="64" y="111"/>
+      <point x="151" y="-9"/>
     </contour>
     <contour>
-      <point x="303" y="9" type="curve" smooth="yes"/>
-      <point x="184" y="9"/>
-      <point x="104" y="123"/>
-      <point x="104" y="294" type="curve" smooth="yes"/>
-      <point x="104" y="466"/>
-      <point x="183" y="581"/>
-      <point x="301" y="581" type="curve" smooth="yes"/>
-      <point x="419" y="581"/>
-      <point x="497" y="465"/>
-      <point x="497" y="291" type="curve" smooth="yes"/>
-      <point x="497" y="122"/>
-      <point x="419" y="9"/>
+      <point x="284" y="9" type="curve" smooth="yes"/>
+      <point x="165" y="9"/>
+      <point x="85" y="123"/>
+      <point x="85" y="294" type="curve" smooth="yes"/>
+      <point x="85" y="466"/>
+      <point x="164" y="581"/>
+      <point x="282" y="581" type="curve" smooth="yes"/>
+      <point x="400" y="581"/>
+      <point x="478" y="465"/>
+      <point x="478" y="291" type="curve" smooth="yes"/>
+      <point x="478" y="122"/>
+      <point x="400" y="9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
index 50d6f4b4..97d06695 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="601"/>
+  <advance width="563"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="86" yOffset="49"/>
+    <component base="_slash.zero.osf" xOffset="67" yOffset="49"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/blank.glif b/src/Cantarell-Regular.ufo/glyphs/blank.glif
index f22ab3f9..c8930aea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/blank.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="816"/>
+  <advance width="750"/>
   <unicode hex="2423"/>
   <note>
 uni2423
 </note>
   <outline>
     <contour>
-      <point x="125" y="0" type="line"/>
-      <point x="691" y="0" type="line"/>
-      <point x="691" y="166" type="line"/>
-      <point x="618" y="166" type="line"/>
-      <point x="618" y="73" type="line"/>
-      <point x="198" y="73" type="line"/>
-      <point x="198" y="166" type="line"/>
-      <point x="125" y="166" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="658" y="0" type="line"/>
+      <point x="658" y="166" type="line"/>
+      <point x="585" y="166" type="line"/>
+      <point x="585" y="73" type="line"/>
+      <point x="165" y="73" type="line"/>
+      <point x="165" y="166" type="line"/>
+      <point x="92" y="166" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif b/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
index 008b9135..8240ec85 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,60 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="601"/>
+  <advance width="576"/>
   <outline>
     <contour>
-      <point x="303" y="-10" type="curve" smooth="yes"/>
-      <point x="447" y="-10"/>
-      <point x="542" y="63"/>
-      <point x="542" y="175" type="curve" smooth="yes"/>
-      <point x="542" y="400"/>
-      <point x="166" y="356"/>
-      <point x="166" y="534" type="curve" smooth="yes"/>
-      <point x="166" y="596"/>
-      <point x="214" y="637"/>
-      <point x="293" y="637" type="curve" smooth="yes"/>
-      <point x="377" y="637"/>
-      <point x="436" y="591"/>
-      <point x="436" y="524" type="curve" smooth="yes"/>
-      <point x="436" y="460"/>
-      <point x="380" y="402"/>
-      <point x="296" y="386" type="curve"/>
-      <point x="357" y="356" type="line"/>
-      <point x="452" y="384"/>
-      <point x="511" y="455"/>
-      <point x="511" y="537" type="curve" smooth="yes"/>
-      <point x="511" y="637"/>
-      <point x="427" y="704"/>
-      <point x="303" y="704" type="curve" smooth="yes"/>
-      <point x="174" y="704"/>
-      <point x="87" y="631"/>
-      <point x="87" y="522" type="curve" smooth="yes"/>
-      <point x="87" y="291"/>
-      <point x="461" y="345"/>
-      <point x="461" y="169" type="curve" smooth="yes"/>
-      <point x="461" y="101"/>
-      <point x="409" y="59"/>
-      <point x="315" y="59" type="curve" smooth="yes"/>
-      <point x="213" y="59"/>
-      <point x="144" y="110"/>
-      <point x="144" y="184" type="curve" smooth="yes"/>
-      <point x="144" y="255"/>
-      <point x="205" y="315"/>
-      <point x="300" y="329" type="curve"/>
-      <point x="249" y="361" type="line"/>
-      <point x="137" y="346"/>
-      <point x="63" y="268"/>
-      <point x="63" y="173" type="curve" smooth="yes"/>
-      <point x="63" y="64"/>
-      <point x="159" y="-10"/>
+      <point x="290" y="-10" type="curve" smooth="yes"/>
+      <point x="434" y="-10"/>
+      <point x="529" y="63"/>
+      <point x="529" y="175" type="curve" smooth="yes"/>
+      <point x="529" y="400"/>
+      <point x="153" y="356"/>
+      <point x="153" y="534" type="curve" smooth="yes"/>
+      <point x="153" y="596"/>
+      <point x="201" y="637"/>
+      <point x="280" y="637" type="curve" smooth="yes"/>
+      <point x="364" y="637"/>
+      <point x="423" y="591"/>
+      <point x="423" y="524" type="curve" smooth="yes"/>
+      <point x="423" y="460"/>
+      <point x="367" y="402"/>
+      <point x="283" y="386" type="curve"/>
+      <point x="344" y="356" type="line"/>
+      <point x="439" y="384"/>
+      <point x="498" y="455"/>
+      <point x="498" y="537" type="curve" smooth="yes"/>
+      <point x="498" y="637"/>
+      <point x="414" y="704"/>
+      <point x="290" y="704" type="curve" smooth="yes"/>
+      <point x="161" y="704"/>
+      <point x="74" y="631"/>
+      <point x="74" y="522" type="curve" smooth="yes"/>
+      <point x="74" y="291"/>
+      <point x="448" y="345"/>
+      <point x="448" y="169" type="curve" smooth="yes"/>
+      <point x="448" y="101"/>
+      <point x="396" y="59"/>
+      <point x="302" y="59" type="curve" smooth="yes"/>
+      <point x="200" y="59"/>
+      <point x="131" y="110"/>
+      <point x="131" y="184" type="curve" smooth="yes"/>
+      <point x="131" y="255"/>
+      <point x="192" y="315"/>
+      <point x="287" y="329" type="curve"/>
+      <point x="236" y="361" type="line"/>
+      <point x="124" y="346"/>
+      <point x="50" y="268"/>
+      <point x="50" y="173" type="curve" smooth="yes"/>
+      <point x="50" y="64"/>
+      <point x="146" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>eight</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>eight</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/five.osf.glif b/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
index d4dd720a..70afe483 100644
--- a/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/five.osf.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five.osf" format="2">
-  <advance width="556"/>
+  <advance width="545"/>
   <outline>
     <contour>
-      <point x="241" y="-110" type="curve" smooth="yes"/>
-      <point x="395" y="-110"/>
-      <point x="498" y="-23"/>
-      <point x="498" y="114" type="curve" smooth="yes"/>
-      <point x="498" y="245"/>
-      <point x="403" y="326"/>
-      <point x="249" y="326" type="curve" smooth="yes"/>
-      <point x="219" y="326"/>
-      <point x="179" y="322"/>
-      <point x="137" y="314" type="curve"/>
-      <point x="156" y="289" type="line"/>
-      <point x="167" y="526" type="line"/>
-      <point x="465" y="526" type="line"/>
-      <point x="465" y="594" type="line"/>
-      <point x="96" y="594" type="line"/>
-      <point x="79" y="240" type="line"/>
-      <point x="124" y="250"/>
-      <point x="181" y="257"/>
-      <point x="223" y="257" type="curve" smooth="yes"/>
-      <point x="345" y="257"/>
-      <point x="417" y="199"/>
-      <point x="417" y="105" type="curve" smooth="yes"/>
-      <point x="417" y="15"/>
-      <point x="352" y="-41"/>
-      <point x="249" y="-41" type="curve" smooth="yes"/>
-      <point x="185" y="-41"/>
-      <point x="118" y="-22"/>
-      <point x="69" y="4" type="curve"/>
-      <point x="46" y="-58" type="line"/>
-      <point x="108" y="-91"/>
-      <point x="174" y="-110"/>
+      <point x="242" y="-110" type="curve" smooth="yes"/>
+      <point x="396" y="-110"/>
+      <point x="499" y="-23"/>
+      <point x="499" y="114" type="curve" smooth="yes"/>
+      <point x="499" y="245"/>
+      <point x="404" y="326"/>
+      <point x="250" y="326" type="curve" smooth="yes"/>
+      <point x="220" y="326"/>
+      <point x="180" y="322"/>
+      <point x="138" y="314" type="curve"/>
+      <point x="157" y="289" type="line"/>
+      <point x="168" y="526" type="line"/>
+      <point x="466" y="526" type="line"/>
+      <point x="466" y="594" type="line"/>
+      <point x="97" y="594" type="line"/>
+      <point x="80" y="240" type="line"/>
+      <point x="125" y="250"/>
+      <point x="182" y="257"/>
+      <point x="224" y="257" type="curve" smooth="yes"/>
+      <point x="346" y="257"/>
+      <point x="418" y="199"/>
+      <point x="418" y="105" type="curve" smooth="yes"/>
+      <point x="418" y="15"/>
+      <point x="353" y="-41"/>
+      <point x="250" y="-41" type="curve" smooth="yes"/>
+      <point x="186" y="-41"/>
+      <point x="119" y="-22"/>
+      <point x="70" y="4" type="curve"/>
+      <point x="47" y="-58" type="line"/>
+      <point x="109" y="-91"/>
+      <point x="175" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>five</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>five</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/four.osf.glif b/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
index 9099bc70..0d99c8d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/four.osf.glif
@@ -1,20 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="621"/>
+  <advance width="587"/>
   <outline>
     <contour>
-      <point x="379" y="-110" type="line"/>
-      <point x="455" y="-110" type="line"/>
-      <point x="455" y="594" type="line"/>
-      <point x="381" y="594" type="line"/>
-      <point x="40" y="106" type="line"/>
-      <point x="40" y="64" type="line"/>
-      <point x="580" y="64" type="line"/>
-      <point x="580" y="132" type="line"/>
-      <point x="124" y="132" type="line"/>
-      <point x="119" y="114" type="line"/>
-      <point x="379" y="486" type="line"/>
-      <point x="379" y="471" type="line"/>
+      <point x="362" y="-110" type="line"/>
+      <point x="438" y="-110" type="line"/>
+      <point x="438" y="594" type="line"/>
+      <point x="364" y="594" type="line"/>
+      <point x="23" y="106" type="line"/>
+      <point x="23" y="64" type="line"/>
+      <point x="563" y="64" type="line"/>
+      <point x="563" y="132" type="line"/>
+      <point x="107" y="132" type="line"/>
+      <point x="102" y="114" type="line"/>
+      <point x="362" y="486" type="line"/>
+      <point x="362" y="471" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>four</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>four</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/germandbls.glif 
b/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
index 069bb652..de6d4876 100644
--- a/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/germandbls.glif
@@ -46,4 +46,10 @@
       <point x="318" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index 8724c053..cb699c2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -789,7 +789,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.bar</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.be-cy</key>
-      <integer>1</integer>
+      <integer>9</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blackCircle</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.blank</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/micro.glif b/src/Cantarell-Regular.ufo/glyphs/micro.glif
index 2d43a474..0297804f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/micro.glif
@@ -1,36 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="639"/>
+  <advance width="575"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="323" y="-10" type="curve" smooth="yes"/>
-      <point x="380" y="-10"/>
-      <point x="428" y="14"/>
-      <point x="484" y="73" type="curve"/>
-      <point x="465" y="134" type="line"/>
-      <point x="425" y="82"/>
-      <point x="384" y="60"/>
-      <point x="332" y="60" type="curve" smooth="yes"/>
-      <point x="255" y="60"/>
-      <point x="200" y="108"/>
-      <point x="200" y="182" type="curve"/>
-      <point x="160" y="166" type="line"/>
-      <point x="160" y="60"/>
-      <point x="225" y="-10"/>
+      <point x="281" y="-10" type="curve" smooth="yes"/>
+      <point x="338" y="-10"/>
+      <point x="386" y="14"/>
+      <point x="442" y="73" type="curve"/>
+      <point x="423" y="134" type="line"/>
+      <point x="383" y="82"/>
+      <point x="342" y="60"/>
+      <point x="290" y="60" type="curve" smooth="yes"/>
+      <point x="213" y="60"/>
+      <point x="158" y="108"/>
+      <point x="158" y="182" type="curve"/>
+      <point x="118" y="166" type="line"/>
+      <point x="118" y="60"/>
+      <point x="183" y="-10"/>
     </contour>
     <contour>
-      <point x="125" y="-217" type="line"/>
-      <point x="200" y="-217" type="line"/>
-      <point x="200" y="482" type="line"/>
-      <point x="125" y="482" type="line"/>
+      <point x="83" y="-217" type="line"/>
+      <point x="158" y="-217" type="line"/>
+      <point x="158" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="534" y="482" type="line"/>
-      <point x="454" y="482" type="line"/>
-      <point x="454" y="56" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="492" y="0" type="line"/>
+      <point x="492" y="482" type="line"/>
+      <point x="412" y="482" type="line"/>
+      <point x="412" y="56" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
index c9fd84fb..68b32c31 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="598"/>
+  <advance width="579"/>
   <outline>
     <contour>
-      <point x="280" y="604" type="curve" smooth="yes"/>
-      <point x="149" y="604"/>
-      <point x="56" y="514"/>
-      <point x="56" y="381" type="curve" smooth="yes"/>
-      <point x="56" y="258"/>
-      <point x="138" y="171"/>
-      <point x="258" y="171" type="curve" smooth="yes"/>
-      <point x="358" y="171"/>
-      <point x="439" y="231"/>
-      <point x="484" y="337" type="curve"/>
-      <point x="464" y="380" type="line"/>
-      <point x="429" y="289"/>
-      <point x="364" y="239"/>
-      <point x="285" y="239" type="curve" smooth="yes"/>
-      <point x="197" y="239"/>
-      <point x="137" y="302"/>
-      <point x="137" y="395" type="curve" smooth="yes"/>
-      <point x="137" y="480"/>
-      <point x="187" y="535"/>
-      <point x="270" y="535" type="curve" smooth="yes"/>
-      <point x="380" y="535"/>
-      <point x="441" y="437"/>
-      <point x="441" y="261" type="curve" smooth="yes"/>
-      <point x="441" y="59"/>
-      <point x="364" y="-41"/>
-      <point x="233" y="-41" type="curve" smooth="yes"/>
-      <point x="184" y="-41"/>
-      <point x="126" y="-28"/>
-      <point x="89" y="-5" type="curve"/>
-      <point x="66" y="-66" type="line"/>
-      <point x="101" y="-93"/>
-      <point x="159" y="-110"/>
-      <point x="224" y="-110" type="curve" smooth="yes"/>
-      <point x="412" y="-110"/>
-      <point x="527" y="27"/>
-      <point x="527" y="266" type="curve" smooth="yes"/>
-      <point x="527" y="484"/>
-      <point x="430" y="604"/>
+      <point x="275" y="604" type="curve" smooth="yes"/>
+      <point x="144" y="604"/>
+      <point x="51" y="514"/>
+      <point x="51" y="381" type="curve" smooth="yes"/>
+      <point x="51" y="258"/>
+      <point x="133" y="171"/>
+      <point x="253" y="171" type="curve" smooth="yes"/>
+      <point x="353" y="171"/>
+      <point x="434" y="231"/>
+      <point x="479" y="337" type="curve"/>
+      <point x="459" y="380" type="line"/>
+      <point x="424" y="289"/>
+      <point x="359" y="239"/>
+      <point x="280" y="239" type="curve" smooth="yes"/>
+      <point x="192" y="239"/>
+      <point x="132" y="302"/>
+      <point x="132" y="395" type="curve" smooth="yes"/>
+      <point x="132" y="480"/>
+      <point x="182" y="535"/>
+      <point x="265" y="535" type="curve" smooth="yes"/>
+      <point x="375" y="535"/>
+      <point x="436" y="437"/>
+      <point x="436" y="261" type="curve" smooth="yes"/>
+      <point x="436" y="59"/>
+      <point x="359" y="-41"/>
+      <point x="228" y="-41" type="curve" smooth="yes"/>
+      <point x="179" y="-41"/>
+      <point x="121" y="-28"/>
+      <point x="84" y="-5" type="curve"/>
+      <point x="61" y="-66" type="line"/>
+      <point x="96" y="-93"/>
+      <point x="154" y="-110"/>
+      <point x="219" y="-110" type="curve" smooth="yes"/>
+      <point x="407" y="-110"/>
+      <point x="522" y="27"/>
+      <point x="522" y="266" type="curve" smooth="yes"/>
+      <point x="522" y="484"/>
+      <point x="425" y="604"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>nine</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>nine</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
index 6532c1a9..71e7affa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.dnom.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.dnom" format="2">
-  <advance width="315"/>
+  <advance width="278"/>
   <note>
 one
 </note>
   <outline>
     <contour>
-      <point x="159" y="-1" type="line"/>
-      <point x="232" y="-1" type="line"/>
-      <point x="232" y="416" type="line"/>
-      <point x="188" y="416" type="line"/>
-      <point x="25" y="337" type="line"/>
-      <point x="53" y="284" type="line"/>
-      <point x="182" y="339" type="line"/>
-      <point x="159" y="362" type="line"/>
+      <point x="139" y="-1" type="line"/>
+      <point x="212" y="-1" type="line"/>
+      <point x="212" y="416" type="line"/>
+      <point x="168" y="416" type="line"/>
+      <point x="5" y="337" type="line"/>
+      <point x="33" y="284" type="line"/>
+      <point x="162" y="339" type="line"/>
+      <point x="139" y="362" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.numr.glif b/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
index 72c90ba3..edbd29c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.numr.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.numr" format="2">
-  <advance width="315"/>
+  <advance width="278"/>
   <outline>
     <component base="one.dnom" yOffset="260"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.osf.glif b/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
index c4e9a5c0..73f9de29 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one.osf" format="2">
-  <advance width="398"/>
+  <advance width="423"/>
   <outline>
     <contour>
-      <point x="220" y="-5" type="line"/>
-      <point x="297" y="-5" type="line"/>
-      <point x="297" y="594" type="line"/>
-      <point x="249" y="594" type="line"/>
-      <point x="2" y="466" type="line"/>
-      <point x="32" y="409" type="line"/>
-      <point x="244" y="510" type="line"/>
-      <point x="220" y="535" type="line"/>
+      <point x="225" y="-5" type="line"/>
+      <point x="302" y="-5" type="line"/>
+      <point x="302" y="594" type="line"/>
+      <point x="254" y="594" type="line"/>
+      <point x="7" y="466" type="line"/>
+      <point x="37" y="409" type="line"/>
+      <point x="249" y="510" type="line"/>
+      <point x="225" y="535" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>one</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif b/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
index 788b606b..97f237ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneeighth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneeighth" format="2">
-  <advance width="914"/>
+  <advance width="877"/>
   <unicode hex="215B"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="eight.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="eight.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onefifth.glif b/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
index af47d4c0..d9797430 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onefifth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefifth" format="2">
-  <advance width="894"/>
+  <advance width="857"/>
   <unicode hex="2155"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="five.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="five.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onefraction.glif 
b/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
index 4ddd4a1e..941d8ef0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onefraction.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onefraction" format="2">
-  <advance width="485"/>
+  <advance width="448"/>
   <unicode hex="215F"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
+    <component base="fraction" xOffset="278"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onehalf.glif b/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
index 1bec3d7b..eb36740b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onehalf.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onehalf" format="2">
-  <advance width="875"/>
+  <advance width="838"/>
   <unicode hex="00BD"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="two.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="two.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif 
b/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
index fb5903f3..57ea34ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneinferior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneinferior" format="2">
-  <advance width="315"/>
+  <advance width="278"/>
   <unicode hex="2081"/>
   <outline>
     <component base="one.dnom" yOffset="-217"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneninth.glif b/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
index 3f543185..e49141b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneninth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneninth" format="2">
-  <advance width="912"/>
+  <advance width="875"/>
   <unicode hex="2151"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="nine.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="nine.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onequarter.glif 
b/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
index 9066576b..43f94163 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onequarter.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onequarter" format="2">
-  <advance width="905"/>
+  <advance width="868"/>
   <unicode hex="00BC"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="four.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="four.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif 
b/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
index 984ed229..6f6c3343 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oneseventh.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oneseventh" format="2">
-  <advance width="845"/>
+  <advance width="808"/>
   <unicode hex="2150"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="seven.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="seven.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onesixth.glif b/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
index dd226ed9..3d6d8005 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onesixth.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesixth" format="2">
-  <advance width="911"/>
+  <advance width="874"/>
   <unicode hex="2159"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="six.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="six.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif 
b/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
index a93bc556..d28ee263 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onesuperior.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onesuperior" format="2">
-  <advance width="315"/>
+  <advance width="278"/>
   <unicode hex="00B9"/>
   <outline>
     <component base="one.dnom" yOffset="370"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onetenth.glif b/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
index d2293a5e..cd76d412 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onetenth.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onetenth" format="2">
-  <advance width="1245"/>
+  <advance width="1171"/>
   <unicode hex="2152"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="one.dnom" xOffset="485"/>
-    <component base="zero.dnom" xOffset="800"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="one.dnom" xOffset="448"/>
+    <component base="zero.dnom" xOffset="726"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/onethird.glif b/src/Cantarell-Regular.ufo/glyphs/onethird.glif
index 9b66df97..c8f9ed9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/onethird.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/onethird.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="onethird" format="2">
-  <advance width="890"/>
+  <advance width="853"/>
   <unicode hex="2153"/>
   <outline>
     <component base="one.numr"/>
-    <component base="fraction" xOffset="315"/>
-    <component base="three.dnom" xOffset="485"/>
+    <component base="fraction" xOffset="278"/>
+    <component base="three.dnom" xOffset="448"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/paragraph.glif b/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
index 027e0132..3c78716c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/paragraph.glif
@@ -1,23 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="725"/>
+  <advance width="660"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="287" y="-170" type="line"/>
-      <point x="365" y="-170" type="line"/>
-      <point x="365" y="625" type="line"/>
-      <point x="522" y="625" type="line"/>
-      <point x="522" y="-170" type="line"/>
-      <point x="600" y="-170" type="line"/>
-      <point x="600" y="694" type="line"/>
-      <point x="307" y="694" type="line" smooth="yes"/>
-      <point x="165" y="694"/>
-      <point x="70" y="610"/>
-      <point x="70" y="484" type="curve" smooth="yes"/>
-      <point x="70" y="349"/>
-      <point x="157" y="259"/>
-      <point x="287" y="259" type="curve"/>
+      <point x="255" y="-170" type="line"/>
+      <point x="333" y="-170" type="line"/>
+      <point x="333" y="625" type="line"/>
+      <point x="490" y="625" type="line"/>
+      <point x="490" y="-170" type="line"/>
+      <point x="568" y="-170" type="line"/>
+      <point x="568" y="694" type="line"/>
+      <point x="275" y="694" type="line" smooth="yes"/>
+      <point x="133" y="694"/>
+      <point x="38" y="610"/>
+      <point x="38" y="484" type="curve" smooth="yes"/>
+      <point x="38" y="349"/>
+      <point x="125" y="259"/>
+      <point x="255" y="259" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|P</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif 
b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
index 68b70594..6d7a8029 100644
--- a/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/perthousand.glif
@@ -94,4 +94,12 @@
       <point x="1193" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>percent</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>percent</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/product.glif b/src/Cantarell-Regular.ufo/glyphs/product.glif
index 3a10dc81..2f29ffef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/product.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/product.glif
@@ -1,17 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="786"/>
+  <advance width="720"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="125" y="-95" type="line"/>
-      <point x="208" y="-95" type="line"/>
-      <point x="208" y="622" type="line"/>
-      <point x="578" y="622" type="line"/>
-      <point x="578" y="-95" type="line"/>
-      <point x="661" y="-95" type="line"/>
-      <point x="661" y="694" type="line"/>
-      <point x="125" y="694" type="line"/>
+      <point x="92" y="-95" type="line"/>
+      <point x="175" y="-95" type="line"/>
+      <point x="175" y="622" type="line"/>
+      <point x="545" y="622" type="line"/>
+      <point x="545" y="-95" type="line"/>
+      <point x="628" y="-95" type="line"/>
+      <point x="628" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif b/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
index a77cefb4..1d2b953e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="541"/>
+  <advance width="519"/>
   <outline>
     <contour>
-      <point x="129" y="-100" type="line"/>
-      <point x="213" y="-100" type="line"/>
-      <point x="501" y="555" type="line"/>
-      <point x="501" y="594" type="line"/>
-      <point x="38" y="594" type="line"/>
-      <point x="38" y="525" type="line"/>
-      <point x="438" y="525" type="line"/>
-      <point x="418" y="554" type="line"/>
+      <point x="118" y="-100" type="line"/>
+      <point x="202" y="-100" type="line"/>
+      <point x="490" y="555" type="line"/>
+      <point x="490" y="594" type="line"/>
+      <point x="27" y="594" type="line"/>
+      <point x="27" y="525" type="line"/>
+      <point x="427" y="525" type="line"/>
+      <point x="407" y="554" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/six.osf.glif b/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
index 2404f829..14ef78c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/six.osf.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="599"/>
+  <advance width="580"/>
   <outline>
     <contour>
-      <point x="319" y="-10" type="curve" smooth="yes"/>
-      <point x="450" y="-10"/>
-      <point x="543" y="80"/>
-      <point x="543" y="213" type="curve" smooth="yes"/>
-      <point x="543" y="338"/>
-      <point x="460" y="424"/>
-      <point x="341" y="424" type="curve" smooth="yes"/>
-      <point x="238" y="424"/>
-      <point x="159" y="361"/>
-      <point x="114" y="256" type="curve"/>
-      <point x="135" y="214" type="line"/>
-      <point x="169" y="303"/>
-      <point x="234" y="354"/>
-      <point x="314" y="354" type="curve" smooth="yes"/>
-      <point x="401" y="354"/>
-      <point x="461" y="292"/>
-      <point x="461" y="199" type="curve" smooth="yes"/>
-      <point x="461" y="114"/>
-      <point x="410" y="60"/>
-      <point x="329" y="60" type="curve" smooth="yes"/>
-      <point x="218" y="60"/>
-      <point x="158" y="159"/>
-      <point x="158" y="334" type="curve" smooth="yes"/>
-      <point x="158" y="535"/>
-      <point x="235" y="634"/>
-      <point x="366" y="634" type="curve" smooth="yes"/>
-      <point x="412" y="634"/>
-      <point x="471" y="622"/>
-      <point x="510" y="598" type="curve"/>
-      <point x="533" y="660" type="line"/>
-      <point x="497" y="687"/>
-      <point x="439" y="704"/>
-      <point x="374" y="704" type="curve" smooth="yes"/>
-      <point x="187" y="704"/>
-      <point x="71" y="567"/>
-      <point x="71" y="328" type="curve" smooth="yes"/>
-      <point x="71" y="110"/>
-      <point x="168" y="-10"/>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="436" y="-10"/>
+      <point x="529" y="80"/>
+      <point x="529" y="213" type="curve" smooth="yes"/>
+      <point x="529" y="338"/>
+      <point x="446" y="424"/>
+      <point x="327" y="424" type="curve" smooth="yes"/>
+      <point x="224" y="424"/>
+      <point x="145" y="361"/>
+      <point x="100" y="256" type="curve"/>
+      <point x="121" y="214" type="line"/>
+      <point x="155" y="303"/>
+      <point x="220" y="354"/>
+      <point x="300" y="354" type="curve" smooth="yes"/>
+      <point x="387" y="354"/>
+      <point x="447" y="292"/>
+      <point x="447" y="199" type="curve" smooth="yes"/>
+      <point x="447" y="114"/>
+      <point x="396" y="60"/>
+      <point x="315" y="60" type="curve" smooth="yes"/>
+      <point x="204" y="60"/>
+      <point x="144" y="159"/>
+      <point x="144" y="334" type="curve" smooth="yes"/>
+      <point x="144" y="535"/>
+      <point x="221" y="634"/>
+      <point x="352" y="634" type="curve" smooth="yes"/>
+      <point x="398" y="634"/>
+      <point x="457" y="622"/>
+      <point x="496" y="598" type="curve"/>
+      <point x="519" y="660" type="line"/>
+      <point x="483" y="687"/>
+      <point x="425" y="704"/>
+      <point x="360" y="704" type="curve" smooth="yes"/>
+      <point x="173" y="704"/>
+      <point x="57" y="567"/>
+      <point x="57" y="328" type="curve" smooth="yes"/>
+      <point x="57" y="110"/>
+      <point x="154" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>six</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>six</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/three.osf.glif b/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
index 0610dca4..865c96d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/three.osf.glif
@@ -1,48 +1,56 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="558"/>
+  <advance width="557"/>
   <outline>
     <contour>
-      <point x="246" y="-110" type="curve" smooth="yes"/>
-      <point x="397" y="-110"/>
-      <point x="502" y="-32"/>
-      <point x="502" y="82" type="curve" smooth="yes"/>
-      <point x="502" y="181"/>
-      <point x="424" y="259"/>
-      <point x="298" y="272" type="curve"/>
-      <point x="297" y="258" type="line"/>
-      <point x="396" y="261"/>
-      <point x="464" y="337"/>
-      <point x="464" y="427" type="curve" smooth="yes"/>
-      <point x="464" y="532"/>
-      <point x="376" y="604"/>
-      <point x="250" y="604" type="curve" smooth="yes"/>
-      <point x="181" y="604"/>
-      <point x="105" y="583"/>
-      <point x="42" y="547" type="curve"/>
-      <point x="61" y="488" type="line"/>
-      <point x="121" y="517"/>
-      <point x="185" y="534"/>
-      <point x="234" y="534" type="curve" smooth="yes"/>
-      <point x="322" y="534"/>
-      <point x="383" y="487"/>
-      <point x="383" y="414" type="curve" smooth="yes"/>
-      <point x="383" y="332"/>
-      <point x="304" y="285"/>
-      <point x="162" y="285" type="curve"/>
-      <point x="162" y="219" type="line"/>
-      <point x="325" y="219"/>
-      <point x="421" y="165"/>
-      <point x="421" y="75" type="curve" smooth="yes"/>
-      <point x="421" y="3"/>
-      <point x="357" y="-40"/>
-      <point x="254" y="-40" type="curve" smooth="yes"/>
-      <point x="184" y="-40"/>
-      <point x="106" y="-21"/>
-      <point x="47" y="8" type="curve"/>
-      <point x="28" y="-56" type="line"/>
-      <point x="94" y="-90"/>
-      <point x="170" y="-110"/>
+      <point x="254" y="-110" type="curve" smooth="yes"/>
+      <point x="405" y="-110"/>
+      <point x="510" y="-32"/>
+      <point x="510" y="82" type="curve" smooth="yes"/>
+      <point x="510" y="181"/>
+      <point x="432" y="259"/>
+      <point x="306" y="272" type="curve"/>
+      <point x="305" y="258" type="line"/>
+      <point x="404" y="261"/>
+      <point x="472" y="337"/>
+      <point x="472" y="427" type="curve" smooth="yes"/>
+      <point x="472" y="532"/>
+      <point x="384" y="604"/>
+      <point x="258" y="604" type="curve" smooth="yes"/>
+      <point x="189" y="604"/>
+      <point x="113" y="583"/>
+      <point x="50" y="547" type="curve"/>
+      <point x="69" y="488" type="line"/>
+      <point x="129" y="517"/>
+      <point x="193" y="534"/>
+      <point x="242" y="534" type="curve" smooth="yes"/>
+      <point x="330" y="534"/>
+      <point x="391" y="487"/>
+      <point x="391" y="414" type="curve" smooth="yes"/>
+      <point x="391" y="332"/>
+      <point x="312" y="285"/>
+      <point x="170" y="285" type="curve"/>
+      <point x="170" y="219" type="line"/>
+      <point x="333" y="219"/>
+      <point x="429" y="165"/>
+      <point x="429" y="75" type="curve" smooth="yes"/>
+      <point x="429" y="3"/>
+      <point x="365" y="-40"/>
+      <point x="262" y="-40" type="curve" smooth="yes"/>
+      <point x="192" y="-40"/>
+      <point x="114" y="-21"/>
+      <point x="55" y="8" type="curve"/>
+      <point x="36" y="-56" type="line"/>
+      <point x="102" y="-90"/>
+      <point x="178" y="-110"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>three</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>three</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/two.osf.glif b/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
index 37b32652..52c97b0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/two.osf.glif
@@ -1,32 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two.osf" format="2">
-  <advance width="543"/>
+  <advance width="522"/>
   <outline>
     <contour>
-      <point x="59" y="0" type="line"/>
-      <point x="492" y="0" type="line"/>
-      <point x="492" y="70" type="line"/>
-      <point x="142" y="70" type="line"/>
-      <point x="149" y="48" type="line"/>
-      <point x="370" y="223"/>
-      <point x="463" y="325"/>
-      <point x="463" y="434" type="curve" smooth="yes"/>
-      <point x="463" y="538"/>
-      <point x="383" y="602"/>
-      <point x="255" y="602" type="curve" smooth="yes"/>
-      <point x="176" y="602"/>
-      <point x="97" y="577"/>
-      <point x="47" y="534" type="curve"/>
-      <point x="72" y="478" type="line"/>
-      <point x="121" y="512"/>
-      <point x="185" y="532"/>
-      <point x="241" y="532" type="curve" smooth="yes"/>
-      <point x="325" y="532"/>
-      <point x="380" y="488"/>
-      <point x="380" y="420" type="curve" smooth="yes"/>
-      <point x="380" y="337"/>
-      <point x="302" y="246"/>
-      <point x="59" y="54" type="curve"/>
+      <point x="47" y="0" type="line"/>
+      <point x="480" y="0" type="line"/>
+      <point x="480" y="70" type="line"/>
+      <point x="130" y="70" type="line"/>
+      <point x="137" y="48" type="line"/>
+      <point x="358" y="223"/>
+      <point x="451" y="325"/>
+      <point x="451" y="434" type="curve" smooth="yes"/>
+      <point x="451" y="538"/>
+      <point x="371" y="602"/>
+      <point x="243" y="602" type="curve" smooth="yes"/>
+      <point x="164" y="602"/>
+      <point x="85" y="577"/>
+      <point x="35" y="534" type="curve"/>
+      <point x="60" y="478" type="line"/>
+      <point x="109" y="512"/>
+      <point x="173" y="532"/>
+      <point x="229" y="532" type="curve" smooth="yes"/>
+      <point x="313" y="532"/>
+      <point x="368" y="488"/>
+      <point x="368" y="420" type="curve" smooth="yes"/>
+      <point x="368" y="337"/>
+      <point x="290" y="246"/>
+      <point x="47" y="54" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>two</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>two</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif b/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
index 9043f14e..e2a65a8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="628"/>
-  <anchor x="315" y="300" name="slash"/>
+  <advance width="612"/>
+  <anchor x="307" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="311" y="-9" type="curve" smooth="yes"/>
-      <point x="468" y="-9"/>
-      <point x="562" y="109"/>
-      <point x="562" y="302" type="curve" smooth="yes"/>
-      <point x="562" y="488"/>
-      <point x="471" y="604"/>
-      <point x="319" y="604" type="curve" smooth="yes"/>
-      <point x="161" y="604"/>
-      <point x="66" y="485"/>
-      <point x="66" y="294" type="curve" smooth="yes"/>
-      <point x="66" y="106"/>
-      <point x="158" y="-9"/>
+      <point x="303" y="-9" type="curve" smooth="yes"/>
+      <point x="460" y="-9"/>
+      <point x="554" y="109"/>
+      <point x="554" y="302" type="curve" smooth="yes"/>
+      <point x="554" y="488"/>
+      <point x="463" y="604"/>
+      <point x="311" y="604" type="curve" smooth="yes"/>
+      <point x="153" y="604"/>
+      <point x="58" y="485"/>
+      <point x="58" y="294" type="curve" smooth="yes"/>
+      <point x="58" y="106"/>
+      <point x="150" y="-9"/>
     </contour>
     <contour>
-      <point x="318" y="60" type="curve" smooth="yes"/>
-      <point x="212" y="60"/>
-      <point x="148" y="152"/>
-      <point x="148" y="302" type="curve" smooth="yes"/>
-      <point x="148" y="447"/>
-      <point x="210" y="536"/>
-      <point x="312" y="536" type="curve" smooth="yes"/>
-      <point x="417" y="536"/>
-      <point x="480" y="442"/>
-      <point x="480" y="294" type="curve" smooth="yes"/>
-      <point x="480" y="149"/>
-      <point x="420" y="60"/>
+      <point x="310" y="60" type="curve" smooth="yes"/>
+      <point x="204" y="60"/>
+      <point x="140" y="152"/>
+      <point x="140" y="302" type="curve" smooth="yes"/>
+      <point x="140" y="447"/>
+      <point x="202" y="536"/>
+      <point x="304" y="536" type="curve" smooth="yes"/>
+      <point x="409" y="536"/>
+      <point x="472" y="442"/>
+      <point x="472" y="294" type="curve" smooth="yes"/>
+      <point x="472" y="149"/>
+      <point x="412" y="60"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>zero</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>zero</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
index 83419109..a7f9f954 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="628"/>
+  <advance width="612"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="92" yOffset="59"/>
+    <component base="_slash.zero.osf" xOffset="84" yOffset="59"/>
   </outline>
   <lib>
     <dict>



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