[cantarell-fonts/respacing] Cyrillic and misc Thin spacing, next iteration



commit c3697280d1077d3216e587fa0843af788edae5c5
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Nov 3 18:52:57 2019 +0000

    Cyrillic and misc Thin spacing, next iteration

 .../glyphs.M_ay 5 19, 13_08/nine.glif              |   8 ++
 src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif          |   6 ++
 src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/asterisk.glif        |   8 +-
 src/Cantarell-Bold.ufo/glyphs/backslash.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/bullet.glif          |   6 ++
 .../glyphs/cheverticalstroke-cy.glif               |  52 +++++-----
 src/Cantarell-Bold.ufo/glyphs/colon.glif           |   2 +
 src/Cantarell-Bold.ufo/glyphs/exclam.glif          |  32 +++----
 src/Cantarell-Bold.ufo/glyphs/exclamdown.glif      |   6 +-
 src/Cantarell-Bold.ufo/glyphs/figuredash.glif      |   6 ++
 src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/nine.glif            |  12 ++-
 src/Cantarell-Bold.ufo/glyphs/nine.osf.glif        |  78 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/numbersign.glif      |   6 ++
 src/Cantarell-Bold.ufo/glyphs/periodcentered.glif  |  10 +-
 src/Cantarell-Bold.ufo/glyphs/question.glif        |  68 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/questiondown.glif    |   6 +-
 src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif        |   6 ++
 src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif |   6 +-
 .../glyphs.M_ay 5 19, 13_08/nine.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/B_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/C_he-cy.glif        |  46 ++++-----
 .../glyphs/C_hedescender-cy.glif                   |   4 +-
 .../glyphs/C_hedieresis-cy.glif                    |   4 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   4 +-
 .../glyphs/C_heverticalstroke-cy.glif              |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/D_e-cy.glif         |  46 ++++-----
 src/Cantarell-Light.ufo/glyphs/D_je-cy.glif        |  58 +++++------
 src/Cantarell-Light.ufo/glyphs/E_f-cy.glif         |  64 +++++++------
 src/Cantarell-Light.ufo/glyphs/E_l-cy.glif         |  42 ++++----
 .../glyphs/E_ndescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_e-cy.glif         |   2 +-
 .../glyphs/G_edescender-cy.glif                    |   2 +-
 .../glyphs/G_hemiddlehook-cy.glif                  |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_je-cy.glif        |   2 +-
 .../glyphs/H_adescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif   |  48 +++++-----
 src/Cantarell-Light.ufo/glyphs/I_a-cy.glif         |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_a-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif  |  36 +++----
 .../glyphs/K_adescender-cy.glif                    |   4 +-
 .../glyphs/K_averticalstroke-cy.glif               |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_je-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/L_je-cy.glif        |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/N_je-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/T_se-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/T_she-cy.glif       |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/U_-cy.glif          |  24 ++---
 src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif  |   4 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_short-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif     |  62 ++++++------
 src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif         |  90 ++++++++---------
 .../glyphs/Z_edescender-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif        |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif   |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |   6 +-
 .../glyphs/Z_hedieresis-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/ampersand.glif      |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/asterisk.glif       |  56 ++++++-----
 src/Cantarell-Light.ufo/glyphs/backslash.glif      |   8 +-
 src/Cantarell-Light.ufo/glyphs/be-cy.glif          |  70 +++++++-------
 src/Cantarell-Light.ufo/glyphs/braceleft.glif      |  66 ++++++-------
 src/Cantarell-Light.ufo/glyphs/braceright.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/bracketleft.glif    |  18 ++--
 src/Cantarell-Light.ufo/glyphs/bracketright.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/bullet.glif         |  32 ++++---
 src/Cantarell-Light.ufo/glyphs/bulletoperator.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/che-cy.glif         |  46 ++++-----
 .../glyphs/chedescender-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif |   4 +-
 .../glyphs/chekhakassian-cy.glif                   |   4 +-
 .../glyphs/cheverticalstroke-cy.glif               |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/colon.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/comma.glif          |  18 ++--
 src/Cantarell-Light.ufo/glyphs/dagger.glif         |  30 +++---
 src/Cantarell-Light.ufo/glyphs/daggerdbl.glif      |  54 +++++------
 src/Cantarell-Light.ufo/glyphs/de-cy.glif          |  46 ++++-----
 src/Cantarell-Light.ufo/glyphs/dje-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/downA_rrow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/dze-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/el-cy.glif          |  42 ++++----
 src/Cantarell-Light.ufo/glyphs/emptyset.glif       |  58 +++++------
 src/Cantarell-Light.ufo/glyphs/endescender-cy.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/enghe-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/estimated.glif      |  62 ++++++------
 src/Cantarell-Light.ufo/glyphs/exclam.glif         |  34 +++----
 src/Cantarell-Light.ufo/glyphs/exclamdown.glif     |   6 +-
 src/Cantarell-Light.ufo/glyphs/figuredash.glif     |  16 +++-
 src/Cantarell-Light.ufo/glyphs/fl.glif             |   2 +-
 src/Cantarell-Light.ufo/glyphs/four.glif           |  26 ++---
 src/Cantarell-Light.ufo/glyphs/four.osf.glif       |  26 ++---
 src/Cantarell-Light.ufo/glyphs/ge-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif |   2 +-
 .../glyphs/ghemiddlehook-cy.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif   |  22 ++---
 src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/gje-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/guillemetleft.glif  |  30 +++---
 src/Cantarell-Light.ufo/glyphs/guillemetright.glif |  30 +++---
 src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif  |  16 ++--
 src/Cantarell-Light.ufo/glyphs/guilsinglright.glif |  16 ++--
 src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif    |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/hyphen.glif         |  10 +-
 src/Cantarell-Light.ufo/glyphs/ia-cy.glif          |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/increment.glif      |  20 ++--
 src/Cantarell-Light.ufo/glyphs/infinity.glif       |  74 +++++++-------
 src/Cantarell-Light.ufo/glyphs/integral.glif       |  66 ++++++-------
 src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/k.glif              |   2 +-
 src/Cantarell-Light.ufo/glyphs/ka-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif   |  36 +++----
 src/Cantarell-Light.ufo/glyphs/kacute.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif |   4 +-
 .../glyphs/kaverticalstroke-cy.glif                |   2 +-
 src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/kje-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/l.glif              |   2 +-
 src/Cantarell-Light.ufo/glyphs/lacute.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/ldot.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/ldotbelow.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif     |   4 +-
 .../glyphs/leftanglebracket-math.glif              |  16 ++--
 src/Cantarell-Light.ufo/glyphs/literS_ign.glif     |  70 +++++++-------
 src/Cantarell-Light.ufo/glyphs/lj.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/lje-cy.glif         |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/llinebelow.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/lslash.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/minute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/nine.glif           |  12 ++-
 src/Cantarell-Light.ufo/glyphs/nine.osf.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/nje-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/numbersign.glif     |  40 ++++----
 src/Cantarell-Light.ufo/glyphs/numero.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/one.glif            |   2 +-
 src/Cantarell-Light.ufo/glyphs/one.osf.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/ordfeminine.glif    |  76 +++++++--------
 src/Cantarell-Light.ufo/glyphs/ordmasculine.glif   |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/parenleft.glif      |  30 +++---
 src/Cantarell-Light.ufo/glyphs/parenright.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/partialdiff.glif    |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/period.glif         |  26 ++---
 src/Cantarell-Light.ufo/glyphs/periodcentered.glif |  10 +-
 src/Cantarell-Light.ufo/glyphs/pi.glif             |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif |   4 +-
 .../glyphs/punctuationspace.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/question.glif       |  70 +++++++-------
 src/Cantarell-Light.ufo/glyphs/questiondown.glif   |  10 +-
 src/Cantarell-Light.ufo/glyphs/quotedbl.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/quotedblbase.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/quotedblleft.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/quotedblright.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/quoteleft.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/quoteright.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/quotesingle.glif    |  10 +-
 src/Cantarell-Light.ufo/glyphs/ratio.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif    |  22 ++---
 .../glyphs/rightanglebracket-math.glif             |  16 ++--
 src/Cantarell-Light.ufo/glyphs/s.glif              |  70 +++++++-------
 src/Cantarell-Light.ufo/glyphs/sacute.glif         |   4 +-
 .../glyphs/sacutedotaccent.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/scaron.glif         |   4 +-
 .../glyphs/scarondotaccent.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/scedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/scircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/scommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotbelow.glif      |   4 +-
 .../glyphs/sdotbelowdotaccent.glif                 |   6 +-
 src/Cantarell-Light.ufo/glyphs/second.glif         |   6 +-
 src/Cantarell-Light.ufo/glyphs/section.glif        | 106 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/semicolon.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/seven.glif          |  18 ++--
 src/Cantarell-Light.ufo/glyphs/seven.osf.glif      |  18 ++--
 src/Cantarell-Light.ufo/glyphs/shcha-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/six.glif            |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/six.osf.glif        |  78 +++++++--------
 src/Cantarell-Light.ufo/glyphs/slash.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/softsign-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/summation.glif      |  26 ++---
 src/Cantarell-Light.ufo/glyphs/te-cy.glif          |  20 ++--
 src/Cantarell-Light.ufo/glyphs/tripleprime.glif    |   8 +-
 src/Cantarell-Light.ufo/glyphs/tse-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/tshe-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/upA_rrow.glif       |  26 +++--
 src/Cantarell-Light.ufo/glyphs/ve-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/yat-cy.glif         |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif      |  62 ++++++------
 src/Cantarell-Light.ufo/glyphs/ze-cy.glif          |  90 ++++++++---------
 src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.glif           |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/zero.osf.glif       |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/zero.zero.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/zhe-cy.glif         |  50 +++++-----
 src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif    |   4 +-
 .../glyphs/zhedescender-cy.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif |   4 +-
 .../glyphs.M_ay 5 19, 13_08/nine.glif              |   8 ++
 src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif       |   6 ++
 .../glyphs/K_adescender-cy.glif                    |   4 +-
 .../glyphs/Z_hedescender-cy.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/asterisk.glif     |   6 ++
 src/Cantarell-Regular.ufo/glyphs/backslash.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/bullet.glif       |   8 +-
 .../glyphs/cheverticalstroke-cy.glif               |  52 +++++-----
 src/Cantarell-Regular.ufo/glyphs/colon.glif        |   2 +
 src/Cantarell-Regular.ufo/glyphs/exclam.glif       |  32 +++----
 src/Cantarell-Regular.ufo/glyphs/exclamdown.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/figuredash.glif   |   6 ++
 .../glyphs/hadescender-cy.glif                     |   4 +-
 .../glyphs/kadescender-cy.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/nine.glif         |   8 ++
 src/Cantarell-Regular.ufo/glyphs/numbersign.glif   |   8 +-
 .../glyphs/periodcentered.glif                     |  10 +-
 src/Cantarell-Regular.ufo/glyphs/questiondown.glif |   6 +-
 src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif     |   6 ++
 .../glyphs/zhedescender-cy.glif                    |   6 +-
 237 files changed, 2323 insertions(+), 2093 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 
19, 13_08/nine.glif
index e1d42fa5..3c9699b5 100644
--- a/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif  
+++ b/src/Cantarell-Bold.ufo/glyphs.M_ay 5 19, 13_08/nine.glif  
@@ -5,4 +5,12 @@
   <outline>
     <component base="six" xScale="-1" yScale="-1" xOffset="601" yOffset="694"/>
   </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/E_f-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
index 929f5738..b8d389c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
@@ -38,4 +38,10 @@
       <point x="550" y="193"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
index 7bc41e92..6ebd9fa6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_adescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="732"/>
+  <advance width="728"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
@@ -10,6 +10,8 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
index e88ee155..fcdeeefd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="1075"/>
+  <advance width="1082"/>
   <unicode hex="0496"/>
   <outline>
     <component base="Zhe-cy"/>
@@ -12,6 +12,8 @@
       <string>Zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Zhe-cy+20</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
index 8ca27499..72a2c7e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asterisk" format="2">
-  <advance width="492"/>
+  <advance width="495"/>
   <unicode hex="002A"/>
   <outline>
     <contour>
@@ -40,4 +40,10 @@
       <point x="232" y="511" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/backslash.glif b/src/Cantarell-Bold.ufo/glyphs/backslash.glif
index 1e8dac5c..6def32b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/backslash.glif
@@ -7,10 +7,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|slash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>slash</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bullet.glif b/src/Cantarell-Bold.ufo/glyphs/bullet.glif
index a14bafd0..de55fdcb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bullet.glif
@@ -18,4 +18,10 @@
       <point x="112" y="138"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
index c746d2a5..caf2452f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,41 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="565"/>
+  <advance width="569"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="201" y="162" type="curve" smooth="yes"/>
-      <point x="271" y="162"/>
-      <point x="333" y="185"/>
-      <point x="377" y="229" type="curve"/>
-      <point x="354" y="331" type="line"/>
-      <point x="331" y="318"/>
-      <point x="291" y="310"/>
-      <point x="263" y="310" type="curve" smooth="yes"/>
-      <point x="219" y="310"/>
-      <point x="184" y="329"/>
-      <point x="184" y="354" type="curve" smooth="yes"/>
-      <point x="184" y="490" type="line"/>
-      <point x="19" y="490" type="line"/>
-      <point x="19" y="315" type="line" smooth="yes"/>
-      <point x="19" y="220"/>
-      <point x="90" y="162"/>
+      <point x="205" y="162" type="curve" smooth="yes"/>
+      <point x="275" y="162"/>
+      <point x="337" y="185"/>
+      <point x="381" y="229" type="curve"/>
+      <point x="358" y="331" type="line"/>
+      <point x="335" y="318"/>
+      <point x="295" y="310"/>
+      <point x="267" y="310" type="curve" smooth="yes"/>
+      <point x="223" y="310"/>
+      <point x="188" y="329"/>
+      <point x="188" y="354" type="curve" smooth="yes"/>
+      <point x="188" y="490" type="line"/>
+      <point x="23" y="490" type="line"/>
+      <point x="23" y="315" type="line" smooth="yes"/>
+      <point x="23" y="220"/>
+      <point x="94" y="162"/>
     </contour>
     <contour>
-      <point x="218" y="67" type="line"/>
-      <point x="299" y="67" type="line"/>
-      <point x="299" y="418" type="line"/>
-      <point x="218" y="418" type="line"/>
+      <point x="222" y="67" type="line"/>
+      <point x="303" y="67" type="line"/>
+      <point x="303" y="418" type="line"/>
+      <point x="222" y="418" type="line"/>
     </contour>
     <contour>
-      <point x="335" y="0" type="line"/>
-      <point x="503" y="0" type="line"/>
-      <point x="503" y="490" type="line"/>
-      <point x="335" y="490" type="line"/>
+      <point x="339" y="0" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="507" y="490" type="line"/>
+      <point x="339" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>en-cy</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/colon.glif b/src/Cantarell-Bold.ufo/glyphs/colon.glif
index da57c1cc..ca1793f1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/colon.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/exclam.glif b/src/Cantarell-Bold.ufo/glyphs/exclam.glif
index 59976dca..e7ed5fe5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/exclam.glif
@@ -4,24 +4,24 @@
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="77" y="267" type="line"/>
-      <point x="211" y="267" type="line"/>
-      <point x="229" y="694" type="line"/>
-      <point x="59" y="694" type="line"/>
+      <point x="80" y="267" type="line"/>
+      <point x="214" y="267" type="line"/>
+      <point x="232" y="694" type="line"/>
+      <point x="62" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="142" y="-10" type="curve" smooth="yes"/>
-      <point x="206" y="-10"/>
-      <point x="248" y="36"/>
-      <point x="248" y="96" type="curve" smooth="yes"/>
-      <point x="248" y="160"/>
-      <point x="206" y="206"/>
-      <point x="142" y="206" type="curve" smooth="yes"/>
-      <point x="78" y="206"/>
-      <point x="36" y="160"/>
-      <point x="36" y="96" type="curve" smooth="yes"/>
-      <point x="36" y="36"/>
-      <point x="78" y="-10"/>
+      <point x="145" y="-10" type="curve" smooth="yes"/>
+      <point x="209" y="-10"/>
+      <point x="251" y="36"/>
+      <point x="251" y="96" type="curve" smooth="yes"/>
+      <point x="251" y="160"/>
+      <point x="209" y="206"/>
+      <point x="145" y="206" type="curve" smooth="yes"/>
+      <point x="81" y="206"/>
+      <point x="39" y="160"/>
+      <point x="39" y="96" type="curve" smooth="yes"/>
+      <point x="39" y="36"/>
+      <point x="81" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif b/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
index 6cc255a5..b97a1d71 100644
--- a/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/exclamdown.glif
@@ -3,11 +3,13 @@
   <advance width="289"/>
   <unicode hex="00A1"/>
   <outline>
-    <component base="exclam" yScale="-1" xOffset="1" yOffset="480"/>
+    <component base="exclam" yScale="-1" yOffset="480"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>exclam</string>
     </dict>
   </lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/figuredash.glif b/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
index 62fb97fe..ec20413a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/figuredash.glif
@@ -10,4 +10,10 @@
       <point x="50" y="329" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
index 3c8082b5..eb49e842 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="546"/>
+  <advance width="548"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
@@ -11,7 +11,7 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>kadescender-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
index 6be8811a..fbd14ed0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="607"/>
+  <advance width="608"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
@@ -10,6 +10,10 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.glif b/src/Cantarell-Bold.ufo/glyphs/nine.glif
index d5f046a9..acc2c745 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="610"/>
+  <advance width="609"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="610" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="609" yOffset="694"/>
   </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/nine.osf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
index 7372ce1d..ca8dd437 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="604"/>
+  <advance width="603"/>
   <outline>
     <contour>
-      <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"/>
-      <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="233" y="-110" type="curve" smooth="yes"/>
+      <point x="451" y="-110"/>
+      <point x="568" y="26"/>
+      <point x="568" y="264" type="curve" smooth="yes"/>
+      <point x="568" y="487"/>
+      <point x="467" y="604"/>
+      <point x="294" y="604" type="curve" smooth="yes"/>
+      <point x="137" y="604"/>
+      <point x="31" y="507"/>
+      <point x="31" y="363" type="curve" smooth="yes"/>
+      <point x="31" y="236"/>
+      <point x="114" y="149"/>
+      <point x="238" y="149" type="curve" smooth="yes"/>
+      <point x="333" y="149"/>
+      <point x="405" y="198"/>
+      <point x="447" y="283" type="curve"/>
+      <point x="406" y="342" type="line"/>
+      <point x="378" y="306"/>
+      <point x="335" y="282"/>
+      <point x="290" y="282" type="curve" smooth="yes"/>
+      <point x="233" y="282"/>
+      <point x="192" y="320"/>
+      <point x="192" y="376" type="curve" smooth="yes"/>
+      <point x="192" y="430"/>
+      <point x="228" y="467"/>
+      <point x="282" y="467" type="curve" smooth="yes"/>
+      <point x="361" y="467"/>
+      <point x="405" y="384"/>
+      <point x="405" y="250" type="curve" smooth="yes"/>
+      <point x="405" y="106"/>
+      <point x="343" y="24"/>
+      <point x="228" y="24" type="curve" smooth="yes"/>
+      <point x="183" y="24"/>
+      <point x="124" y="37"/>
+      <point x="85" y="55" type="curve"/>
+      <point x="42" y="-69" type="line"/>
+      <point x="94" y="-95"/>
+      <point x="161" y="-110"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/numbersign.glif b/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
index 8f534086..f2a09bb2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/numbersign.glif
@@ -28,4 +28,10 @@
       <point x="38" y="565" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
index d14598e2..80221e76 100644
--- a/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/periodcentered.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="periodcentered" format="2">
-  <advance width="282"/>
+  <advance width="286"/>
   <unicode hex="00B7"/>
   <outline>
     <component base="period" yOffset="170"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/question.glif b/src/Cantarell-Bold.ufo/glyphs/question.glif
index e70da149..54628567 100644
--- a/src/Cantarell-Bold.ufo/glyphs/question.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/question.glif
@@ -4,42 +4,42 @@
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="153" y="267" type="line"/>
-      <point x="328" y="267" type="line"/>
-      <point x="328" y="294" type="line" smooth="yes"/>
-      <point x="328" y="350"/>
-      <point x="457" y="382"/>
-      <point x="457" y="523" type="curve" smooth="yes"/>
-      <point x="457" y="639"/>
-      <point x="371" y="704"/>
-      <point x="219" y="704" type="curve" smooth="yes"/>
-      <point x="145" y="704"/>
-      <point x="70" y="687"/>
-      <point x="6" y="659" type="curve"/>
-      <point x="46" y="528" type="line"/>
-      <point x="88" y="546"/>
-      <point x="131" y="554"/>
-      <point x="175" y="554" type="curve" smooth="yes"/>
-      <point x="241" y="554"/>
-      <point x="277" y="535"/>
-      <point x="277" y="499" type="curve" smooth="yes"/>
-      <point x="277" y="432"/>
-      <point x="153" y="388"/>
-      <point x="153" y="294" type="curve" smooth="yes"/>
+      <point x="143" y="267" type="line"/>
+      <point x="318" y="267" type="line"/>
+      <point x="318" y="294" type="line" smooth="yes"/>
+      <point x="318" y="350"/>
+      <point x="447" y="382"/>
+      <point x="447" y="523" type="curve" smooth="yes"/>
+      <point x="447" y="639"/>
+      <point x="361" y="704"/>
+      <point x="209" y="704" type="curve" smooth="yes"/>
+      <point x="135" y="704"/>
+      <point x="60" y="687"/>
+      <point x="-4" y="659" type="curve"/>
+      <point x="36" y="528" type="line"/>
+      <point x="78" y="546"/>
+      <point x="121" y="554"/>
+      <point x="165" y="554" type="curve" smooth="yes"/>
+      <point x="231" y="554"/>
+      <point x="267" y="535"/>
+      <point x="267" y="499" type="curve" smooth="yes"/>
+      <point x="267" y="432"/>
+      <point x="143" y="388"/>
+      <point x="143" y="294" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="239" y="-10" type="curve" smooth="yes"/>
-      <point x="301" y="-10"/>
-      <point x="345" y="34"/>
-      <point x="345" y="96" type="curve" smooth="yes"/>
-      <point x="345" y="161"/>
-      <point x="302" y="206"/>
-      <point x="239" y="206" type="curve" smooth="yes"/>
-      <point x="176" y="206"/>
-      <point x="133" y="161"/>
-      <point x="133" y="96" type="curve" smooth="yes"/>
-      <point x="133" y="34"/>
-      <point x="177" y="-10"/>
+      <point x="229" y="-10" type="curve" smooth="yes"/>
+      <point x="291" y="-10"/>
+      <point x="335" y="34"/>
+      <point x="335" y="96" type="curve" smooth="yes"/>
+      <point x="335" y="161"/>
+      <point x="292" y="206"/>
+      <point x="229" y="206" type="curve" smooth="yes"/>
+      <point x="166" y="206"/>
+      <point x="123" y="161"/>
+      <point x="123" y="96" type="curve" smooth="yes"/>
+      <point x="123" y="34"/>
+      <point x="167" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/questiondown.glif b/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
index b8fa796e..3785cdf2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/questiondown.glif
@@ -7,8 +7,10 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
index aeb6cb59..4e654a6b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upA_rrow.glif
@@ -19,4 +19,10 @@ arrowup
       <point x="248" y="336" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
index 61df4e9b..59badc5e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="861"/>
+  <advance width="860"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
@@ -11,7 +11,9 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=zhe-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/nine.glif b/src/Cantarell-Light.ufo/glyphs.M_ay 
5 19, 13_08/nine.glif
index 3a48e78e..166722b8 100644
--- a/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/nine.glif 
+++ b/src/Cantarell-Light.ufo/glyphs.M_ay 5 19, 13_08/nine.glif 
@@ -5,4 +5,12 @@
   <outline>
     <component base="six" xScale="-1" yScale="-1" xOffset="598" yOffset="694"/>
   </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/B_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
index e0a7de34..e5ade8cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="619"/>
+  <advance width="627"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
index cb70f68c..f20a4e23 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="629"/>
+  <advance width="638"/>
   <unicode hex="0427"/>
-  <anchor x="526" y="0" name="bottomright"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="535" y="0" name="bottomright"/>
+  <anchor x="318" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="276" y="263" type="curve" smooth="yes"/>
-      <point x="365" y="263"/>
-      <point x="453" y="292"/>
-      <point x="503" y="329" type="curve"/>
-      <point x="493" y="340" type="line"/>
-      <point x="449" y="309"/>
-      <point x="362" y="281"/>
-      <point x="278" y="281" type="curve" smooth="yes"/>
-      <point x="162" y="281"/>
-      <point x="94" y="338"/>
-      <point x="94" y="435" type="curve" smooth="yes"/>
-      <point x="94" y="694" type="line"/>
-      <point x="73" y="694" type="line"/>
-      <point x="73" y="435" type="line" smooth="yes"/>
-      <point x="73" y="328"/>
-      <point x="146" y="263"/>
+      <point x="285" y="263" type="curve" smooth="yes"/>
+      <point x="374" y="263"/>
+      <point x="462" y="292"/>
+      <point x="512" y="329" type="curve"/>
+      <point x="502" y="340" type="line"/>
+      <point x="458" y="309"/>
+      <point x="371" y="281"/>
+      <point x="287" y="281" type="curve" smooth="yes"/>
+      <point x="171" y="281"/>
+      <point x="103" y="338"/>
+      <point x="103" y="435" type="curve" smooth="yes"/>
+      <point x="103" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="82" y="435" type="line" smooth="yes"/>
+      <point x="82" y="328"/>
+      <point x="155" y="263"/>
     </contour>
     <contour>
-      <point x="485" y="0" type="line"/>
-      <point x="506" y="0" type="line"/>
-      <point x="506" y="694" type="line"/>
-      <point x="485" y="694" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="515" y="0" type="line"/>
+      <point x="515" y="694" type="line"/>
+      <point x="494" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
index b1210c93..40402542 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="613"/>
+  <advance width="644"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="descender-cy.case" xOffset="430"/>
+    <component base="descender-cy.case" xOffset="439"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
index 7bcae017..4ed977c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="629"/>
+  <advance width="638"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="dieresiscomb.case" xOffset="89"/>
+    <component base="dieresiscomb.case" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
index e70f293b..0ed252ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="629"/>
+  <advance width="638"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
-    <component base="_descenderreverse-cy.case" xOffset="399"/>
+    <component base="_descenderreverse-cy.case" xOffset="408"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
index 92a03588..1c095466 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="649"/>
+  <advance width="658"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
-      <point x="287" y="263" type="curve" smooth="yes"/>
-      <point x="375" y="263"/>
-      <point x="468" y="290"/>
-      <point x="523" y="329" type="curve"/>
-      <point x="513" y="340" type="line"/>
-      <point x="464" y="307"/>
-      <point x="372" y="281"/>
-      <point x="289" y="281" type="curve" smooth="yes"/>
-      <point x="164" y="281"/>
-      <point x="94" y="338"/>
-      <point x="94" y="435" type="curve" smooth="yes"/>
-      <point x="94" y="694" type="line"/>
-      <point x="73" y="694" type="line"/>
-      <point x="73" y="435" type="line" smooth="yes"/>
-      <point x="73" y="328"/>
-      <point x="148" y="263"/>
+      <point x="296" y="263" type="curve" smooth="yes"/>
+      <point x="384" y="263"/>
+      <point x="477" y="290"/>
+      <point x="532" y="329" type="curve"/>
+      <point x="522" y="340" type="line"/>
+      <point x="473" y="307"/>
+      <point x="381" y="281"/>
+      <point x="298" y="281" type="curve" smooth="yes"/>
+      <point x="173" y="281"/>
+      <point x="103" y="338"/>
+      <point x="103" y="435" type="curve" smooth="yes"/>
+      <point x="103" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="82" y="435" type="line" smooth="yes"/>
+      <point x="82" y="328"/>
+      <point x="157" y="263"/>
     </contour>
     <contour>
-      <point x="289" y="96" type="line"/>
-      <point x="309" y="96" type="line"/>
-      <point x="309" y="456" type="line"/>
-      <point x="289" y="456" type="line"/>
+      <point x="298" y="96" type="line"/>
+      <point x="318" y="96" type="line"/>
+      <point x="318" y="456" type="line"/>
+      <point x="298" y="456" type="line"/>
     </contour>
     <contour>
-      <point x="505" y="0" type="line"/>
-      <point x="526" y="0" type="line"/>
-      <point x="526" y="694" type="line"/>
-      <point x="505" y="694" type="line"/>
+      <point x="514" y="0" type="line"/>
+      <point x="535" y="0" type="line"/>
+      <point x="535" y="694" type="line"/>
+      <point x="514" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
index 797a95a9..d77ee27f 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="De-cy" format="2">
-  <advance width="666"/>
+  <advance width="702"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="58" y="2" type="line"/>
-      <point x="164" y="2"/>
-      <point x="219" y="141"/>
-      <point x="219" y="407" type="curve" smooth="yes"/>
-      <point x="219" y="675" type="line"/>
-      <point x="537" y="675" type="line"/>
-      <point x="537" y="6" type="line"/>
-      <point x="559" y="6" type="line"/>
-      <point x="559" y="694" type="line"/>
-      <point x="197" y="694" type="line"/>
-      <point x="197" y="409" type="line" smooth="yes"/>
-      <point x="197" y="153"/>
-      <point x="149" y="19"/>
-      <point x="56" y="19" type="curve"/>
+      <point x="72" y="2" type="line"/>
+      <point x="178" y="2"/>
+      <point x="233" y="141"/>
+      <point x="233" y="407" type="curve" smooth="yes"/>
+      <point x="233" y="675" type="line"/>
+      <point x="551" y="675" type="line"/>
+      <point x="551" y="6" type="line"/>
+      <point x="573" y="6" type="line"/>
+      <point x="573" y="694" type="line"/>
+      <point x="211" y="694" type="line"/>
+      <point x="211" y="409" type="line" smooth="yes"/>
+      <point x="211" y="153"/>
+      <point x="163" y="19"/>
+      <point x="70" y="19" type="curve"/>
     </contour>
     <contour>
-      <point x="30" y="-175" type="line"/>
-      <point x="51" y="-175" type="line"/>
-      <point x="51" y="0" type="line"/>
-      <point x="614" y="0" type="line"/>
-      <point x="614" y="-175" type="line"/>
-      <point x="635" y="-175" type="line"/>
-      <point x="635" y="19" type="line"/>
-      <point x="30" y="19" type="line"/>
+      <point x="44" y="-175" type="line"/>
+      <point x="65" y="-175" type="line"/>
+      <point x="65" y="0" type="line"/>
+      <point x="628" y="0" type="line"/>
+      <point x="628" y="-175" type="line"/>
+      <point x="649" y="-175" type="line"/>
+      <point x="649" y="19" type="line"/>
+      <point x="44" y="19" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
index f6e1fa03..797b79d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dje-cy" format="2">
-  <advance width="749"/>
+  <advance width="770"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
-      <point x="444" y="0" type="line"/>
-      <point x="597" y="7"/>
-      <point x="689" y="91"/>
-      <point x="689" y="223" type="curve" smooth="yes"/>
-      <point x="689" y="349"/>
-      <point x="606" y="431"/>
-      <point x="478" y="431" type="curve" smooth="yes"/>
-      <point x="392" y="431"/>
-      <point x="298" y="395"/>
-      <point x="255" y="345" type="curve"/>
-      <point x="265" y="334" type="line"/>
-      <point x="305" y="379"/>
-      <point x="396" y="413"/>
-      <point x="475" y="413" type="curve" smooth="yes"/>
-      <point x="592" y="413"/>
-      <point x="668" y="338"/>
-      <point x="668" y="223" type="curve" smooth="yes"/>
-      <point x="668" y="102"/>
-      <point x="583" y="25"/>
-      <point x="442" y="18" type="curve"/>
+      <point x="457" y="0" type="line"/>
+      <point x="610" y="7"/>
+      <point x="702" y="91"/>
+      <point x="702" y="223" type="curve" smooth="yes"/>
+      <point x="702" y="349"/>
+      <point x="619" y="431"/>
+      <point x="491" y="431" type="curve" smooth="yes"/>
+      <point x="405" y="431"/>
+      <point x="311" y="395"/>
+      <point x="268" y="345" type="curve"/>
+      <point x="278" y="334" type="line"/>
+      <point x="318" y="379"/>
+      <point x="409" y="413"/>
+      <point x="488" y="413" type="curve" smooth="yes"/>
+      <point x="605" y="413"/>
+      <point x="681" y="338"/>
+      <point x="681" y="223" type="curve" smooth="yes"/>
+      <point x="681" y="102"/>
+      <point x="596" y="25"/>
+      <point x="455" y="18" type="curve"/>
     </contour>
     <contour>
-      <point x="253" y="0" type="line"/>
-      <point x="274" y="0" type="line"/>
-      <point x="274" y="694" type="line"/>
-      <point x="253" y="694" type="line"/>
+      <point x="266" y="0" type="line"/>
+      <point x="287" y="0" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="266" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="22" y="676" type="line"/>
-      <point x="526" y="676" type="line"/>
-      <point x="526" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="539" y="676" type="line"/>
+      <point x="539" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
index 5dcae123..035b0046 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
@@ -1,41 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ef-cy" format="2">
-  <advance width="796"/>
+  <advance width="798"/>
   <unicode hex="0424"/>
   <outline>
     <contour>
-      <point x="386" y="-20" type="line"/>
-      <point x="407" y="-20" type="line"/>
-      <point x="407" y="714" type="line"/>
-      <point x="386" y="714" type="line"/>
+      <point x="387" y="-20" type="line"/>
+      <point x="408" y="-20" type="line"/>
+      <point x="408" y="714" type="line"/>
+      <point x="387" y="714" type="line"/>
     </contour>
     <contour>
-      <point x="397" y="86" type="curve" smooth="yes"/>
-      <point x="609" y="86"/>
-      <point x="734" y="184"/>
-      <point x="734" y="351" type="curve" smooth="yes"/>
-      <point x="734" y="517"/>
-      <point x="610" y="625"/>
-      <point x="399" y="625" type="curve" smooth="yes"/>
-      <point x="187" y="625"/>
-      <point x="62" y="516"/>
-      <point x="62" y="349" type="curve" smooth="yes"/>
-      <point x="62" y="184"/>
-      <point x="186" y="86"/>
+      <point x="398" y="86" type="curve" smooth="yes"/>
+      <point x="610" y="86"/>
+      <point x="735" y="184"/>
+      <point x="735" y="351" type="curve" smooth="yes"/>
+      <point x="735" y="517"/>
+      <point x="611" y="625"/>
+      <point x="400" y="625" type="curve" smooth="yes"/>
+      <point x="188" y="625"/>
+      <point x="63" y="516"/>
+      <point x="63" y="349" type="curve" smooth="yes"/>
+      <point x="63" y="184"/>
+      <point x="187" y="86"/>
     </contour>
     <contour>
-      <point x="400" y="105" type="curve" smooth="yes"/>
-      <point x="201" y="105"/>
-      <point x="84" y="196"/>
-      <point x="84" y="351" type="curve" smooth="yes"/>
-      <point x="84" y="505"/>
-      <point x="200" y="606"/>
-      <point x="397" y="606" type="curve" smooth="yes"/>
-      <point x="595" y="606"/>
-      <point x="712" y="504"/>
-      <point x="712" y="349" type="curve" smooth="yes"/>
-      <point x="712" y="196"/>
-      <point x="596" y="105"/>
+      <point x="401" y="105" type="curve" smooth="yes"/>
+      <point x="202" y="105"/>
+      <point x="85" y="196"/>
+      <point x="85" y="351" type="curve" smooth="yes"/>
+      <point x="85" y="505"/>
+      <point x="201" y="606"/>
+      <point x="398" y="606" type="curve" smooth="yes"/>
+      <point x="596" y="606"/>
+      <point x="713" y="504"/>
+      <point x="713" y="349" type="curve" smooth="yes"/>
+      <point x="713" y="196"/>
+      <point x="597" y="105"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
index ef7fa2b4..1bbdf82a 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="698"/>
+  <advance width="694"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
-      <point x="110" y="-6" type="curve" smooth="yes"/>
-      <point x="198" y="-6"/>
-      <point x="229" y="89"/>
-      <point x="229" y="362" type="curve" smooth="yes"/>
-      <point x="229" y="675" type="line"/>
-      <point x="553" y="675" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="207" y="694" type="line"/>
-      <point x="207" y="369" type="line" smooth="yes"/>
-      <point x="207" y="89"/>
-      <point x="185" y="14"/>
-      <point x="106" y="14" type="curve" smooth="yes"/>
-      <point x="84" y="14"/>
-      <point x="64" y="20"/>
-      <point x="47" y="31" type="curve"/>
-      <point x="40" y="13" type="line"/>
-      <point x="57" y="2"/>
-      <point x="85" y="-6"/>
+      <point x="106" y="-6" type="curve" smooth="yes"/>
+      <point x="194" y="-6"/>
+      <point x="225" y="89"/>
+      <point x="225" y="362" type="curve" smooth="yes"/>
+      <point x="225" y="675" type="line"/>
+      <point x="549" y="675" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="203" y="369" type="line" smooth="yes"/>
+      <point x="203" y="89"/>
+      <point x="181" y="14"/>
+      <point x="102" y="14" type="curve" smooth="yes"/>
+      <point x="80" y="14"/>
+      <point x="60" y="20"/>
+      <point x="43" y="31" type="curve"/>
+      <point x="36" y="13" type="line"/>
+      <point x="53" y="2"/>
+      <point x="81" y="-6"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
index 9c288d1c..54e17c5c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="693"/>
+  <advance width="715"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
index 7c6e7099..63aa0fb3 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="889"/>
+  <advance width="902"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
index e99ad48d..83964110 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ge-cy" format="2">
-  <advance width="522"/>
+  <advance width="535"/>
   <unicode hex="0413"/>
   <anchor x="165" y="0" name="bottomright"/>
   <anchor x="278" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
index 7b3d23b3..5973f712 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gedescender-cy" format="2">
-  <advance width="522"/>
+  <advance width="535"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
index 94541c2b..12dfab07 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghemiddlehook-cy" format="2">
-  <advance width="646"/>
+  <advance width="654"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
index 21ea73b2..249a9106 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="532"/>
+  <advance width="545"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
index 598bbed1..c52a71e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gheupturn-cy" format="2">
-  <advance width="517"/>
+  <advance width="530"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
index 178dca7a..6c9f1d8c 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gje-cy" format="2">
-  <advance width="522"/>
+  <advance width="535"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
index 5fecbe9d..ef38f558 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="624"/>
+  <advance width="646"/>
   <unicode hex="04B2"/>
   <outline>
     <component base="Ha-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
index 3303d08f..12820381 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_ardsign-cy.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hardsign-cy" format="2">
-  <advance width="692"/>
+  <advance width="713"/>
   <unicode hex="042A"/>
-  <anchor x="338" y="694" name="top"/>
+  <anchor x="351" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="214" y="0" type="line"/>
-      <point x="411" y="0" type="line" smooth="yes"/>
-      <point x="550" y="0"/>
-      <point x="632" y="74"/>
-      <point x="632" y="200" type="curve" smooth="yes"/>
-      <point x="632" y="322"/>
-      <point x="557" y="403"/>
-      <point x="444" y="403" type="curve" smooth="yes"/>
-      <point x="228" y="403" type="line"/>
-      <point x="228" y="386" type="line"/>
-      <point x="434" y="386" type="line" smooth="yes"/>
-      <point x="540" y="386"/>
-      <point x="610" y="310"/>
-      <point x="610" y="195" type="curve" smooth="yes"/>
-      <point x="610" y="84"/>
-      <point x="540" y="18"/>
-      <point x="422" y="18" type="curve" smooth="yes"/>
-      <point x="236" y="18" type="line"/>
-      <point x="236" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
-      <point x="22" y="676" type="line"/>
-      <point x="214" y="676" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="424" y="0" type="line" smooth="yes"/>
+      <point x="563" y="0"/>
+      <point x="645" y="74"/>
+      <point x="645" y="200" type="curve" smooth="yes"/>
+      <point x="645" y="322"/>
+      <point x="570" y="403"/>
+      <point x="457" y="403" type="curve" smooth="yes"/>
+      <point x="241" y="403" type="line"/>
+      <point x="241" y="386" type="line"/>
+      <point x="447" y="386" type="line" smooth="yes"/>
+      <point x="553" y="386"/>
+      <point x="623" y="310"/>
+      <point x="623" y="195" type="curve" smooth="yes"/>
+      <point x="623" y="84"/>
+      <point x="553" y="18"/>
+      <point x="435" y="18" type="curve" smooth="yes"/>
+      <point x="249" y="18" type="line"/>
+      <point x="249" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="227" y="676" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
index 6f54bf26..9e6fe75e 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="618"/>
+  <advance width="631"/>
   <unicode hex="042F"/>
-  <anchor x="300" y="694" name="top"/>
+  <anchor x="313" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="474" y="0" type="line"/>
-      <point x="495" y="0" type="line"/>
-      <point x="495" y="694" type="line"/>
-      <point x="290" y="694" type="line" smooth="yes"/>
-      <point x="150" y="694"/>
-      <point x="65" y="618"/>
-      <point x="65" y="489" type="curve" smooth="yes"/>
-      <point x="65" y="365"/>
-      <point x="149" y="288"/>
-      <point x="285" y="288" type="curve" smooth="yes"/>
-      <point x="484" y="288" type="line"/>
-      <point x="484" y="306" type="line"/>
-      <point x="290" y="306" type="line" smooth="yes"/>
-      <point x="163" y="306"/>
-      <point x="87" y="377"/>
-      <point x="87" y="495" type="curve" smooth="yes"/>
-      <point x="87" y="610"/>
-      <point x="160" y="676"/>
-      <point x="283" y="676" type="curve" smooth="yes"/>
-      <point x="474" y="676" type="line"/>
+      <point x="487" y="0" type="line"/>
+      <point x="508" y="0" type="line"/>
+      <point x="508" y="694" type="line"/>
+      <point x="303" y="694" type="line" smooth="yes"/>
+      <point x="163" y="694"/>
+      <point x="78" y="618"/>
+      <point x="78" y="489" type="curve" smooth="yes"/>
+      <point x="78" y="365"/>
+      <point x="162" y="288"/>
+      <point x="298" y="288" type="curve" smooth="yes"/>
+      <point x="497" y="288" type="line"/>
+      <point x="497" y="306" type="line"/>
+      <point x="303" y="306" type="line" smooth="yes"/>
+      <point x="176" y="306"/>
+      <point x="100" y="377"/>
+      <point x="100" y="495" type="curve" smooth="yes"/>
+      <point x="100" y="610"/>
+      <point x="173" y="676"/>
+      <point x="296" y="676" type="curve" smooth="yes"/>
+      <point x="487" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="61" y="0" type="line"/>
-      <point x="86" y="0" type="line"/>
-      <point x="265" y="302" type="line"/>
-      <point x="243" y="302" type="line"/>
+      <point x="74" y="0" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="278" y="302" type="line"/>
+      <point x="256" y="302" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
index bf405ac2..18c758db 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Izhitsa-cy" format="2">
-  <advance width="672"/>
+  <advance width="668"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
index 74f49b16..dad6abee 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ka-cy" format="2">
-  <advance width="621"/>
+  <advance width="634"/>
   <unicode hex="041A"/>
   <anchor x="588" y="0" name="bottomright"/>
   <anchor x="322" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
index f8d4e36e..59fe5648 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kabashkir-cy" format="2">
-  <advance width="714"/>
+  <advance width="740"/>
   <unicode hex="04A0"/>
   <outline>
     <contour>
-      <point x="661" y="0" type="line"/>
-      <point x="686" y="0" type="line"/>
-      <point x="391" y="364" type="line"/>
-      <point x="391" y="353" type="line"/>
-      <point x="671" y="694" type="line"/>
-      <point x="647" y="694" type="line"/>
-      <point x="372" y="357" type="line"/>
+      <point x="674" y="0" type="line"/>
+      <point x="699" y="0" type="line"/>
+      <point x="404" y="364" type="line"/>
+      <point x="404" y="353" type="line"/>
+      <point x="684" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
+      <point x="385" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="216" y="0" type="line"/>
-      <point x="236" y="0" type="line"/>
-      <point x="236" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
-      <point x="22" y="676" type="line"/>
-      <point x="216" y="676" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="249" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="229" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="348" type="line"/>
-      <point x="386" y="348" type="line"/>
-      <point x="386" y="366" type="line"/>
-      <point x="225" y="366" type="line"/>
+      <point x="238" y="348" type="line"/>
+      <point x="399" y="348" type="line"/>
+      <point x="399" y="366" type="line"/>
+      <point x="238" y="366" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
index 4690f502..4f455082 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="684"/>
+  <advance width="695"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
@@ -10,6 +10,8 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
index 99e090a1..9c097b39 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="617"/>
+  <advance width="630"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
index 925c3086..6ae1a5e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kje-cy" format="2">
-  <advance width="621"/>
+  <advance width="634"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
index ae66d307..f2ff678c 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lje-cy" format="2">
-  <advance width="1050"/>
+  <advance width="1054"/>
   <unicode hex="0409"/>
   <outline>
     <contour>
-      <point x="110" y="-6" type="curve" smooth="yes"/>
-      <point x="198" y="-6"/>
-      <point x="229" y="89"/>
-      <point x="229" y="362" type="curve" smooth="yes"/>
-      <point x="229" y="675" type="line"/>
-      <point x="553" y="675" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="575" y="0" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="207" y="694" type="line"/>
-      <point x="207" y="369" type="line" smooth="yes"/>
-      <point x="207" y="89"/>
-      <point x="185" y="14"/>
-      <point x="106" y="14" type="curve" smooth="yes"/>
-      <point x="84" y="14"/>
-      <point x="64" y="20"/>
-      <point x="47" y="31" type="curve"/>
-      <point x="40" y="13" type="line"/>
-      <point x="57" y="2"/>
-      <point x="85" y="-6"/>
+      <point x="106" y="-6" type="curve" smooth="yes"/>
+      <point x="194" y="-6"/>
+      <point x="225" y="89"/>
+      <point x="225" y="362" type="curve" smooth="yes"/>
+      <point x="225" y="675" type="line"/>
+      <point x="549" y="675" type="line"/>
+      <point x="549" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="203" y="369" type="line" smooth="yes"/>
+      <point x="203" y="89"/>
+      <point x="181" y="14"/>
+      <point x="102" y="14" type="curve" smooth="yes"/>
+      <point x="80" y="14"/>
+      <point x="60" y="20"/>
+      <point x="43" y="31" type="curve"/>
+      <point x="36" y="13" type="line"/>
+      <point x="53" y="2"/>
+      <point x="81" y="-6"/>
     </contour>
     <contour>
-      <point x="567" y="0" type="line"/>
-      <point x="762" y="0" type="line" smooth="yes"/>
-      <point x="905" y="0"/>
-      <point x="990" y="73"/>
-      <point x="990" y="200" type="curve" smooth="yes"/>
-      <point x="990" y="322"/>
-      <point x="912" y="403"/>
-      <point x="796" y="403" type="curve" smooth="yes"/>
-      <point x="572" y="403" type="line"/>
-      <point x="572" y="386" type="line"/>
-      <point x="786" y="386" type="line" smooth="yes"/>
-      <point x="893" y="386"/>
-      <point x="968" y="312"/>
-      <point x="968" y="195" type="curve" smooth="yes"/>
-      <point x="968" y="82"/>
-      <point x="898" y="18"/>
-      <point x="773" y="18" type="curve" smooth="yes"/>
-      <point x="567" y="18" type="line"/>
+      <point x="563" y="0" type="line"/>
+      <point x="758" y="0" type="line" smooth="yes"/>
+      <point x="901" y="0"/>
+      <point x="986" y="73"/>
+      <point x="986" y="200" type="curve" smooth="yes"/>
+      <point x="986" y="322"/>
+      <point x="908" y="403"/>
+      <point x="792" y="403" type="curve" smooth="yes"/>
+      <point x="568" y="403" type="line"/>
+      <point x="568" y="386" type="line"/>
+      <point x="782" y="386" type="line" smooth="yes"/>
+      <point x="889" y="386"/>
+      <point x="964" y="312"/>
+      <point x="964" y="195" type="curve" smooth="yes"/>
+      <point x="964" y="82"/>
+      <point x="894" y="18"/>
+      <point x="769" y="18" type="curve" smooth="yes"/>
+      <point x="563" y="18" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
index d247ab83..25e404bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nje-cy" format="2">
-  <advance width="1078"/>
+  <advance width="1086"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
index 9ba7d09d..3e0d272b 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="964"/>
+  <advance width="986"/>
   <unicode hex="0429"/>
   <outline>
     <component base="Sha-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
index 89fbe6e1..ea2f83f1 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shha-cy" format="2">
-  <advance width="631"/>
+  <advance width="640"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
index 11c41cf0..3bebc601 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Softsign-cy" format="2">
-  <advance width="610"/>
+  <advance width="618"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
index e79fa0ae..2a5b9a6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="680"/>
+  <advance width="702"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
index e58fba09..63b36c85 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tshe-cy" format="2">
-  <advance width="762"/>
+  <advance width="784"/>
   <unicode hex="040B"/>
   <outline>
     <contour>
-      <point x="255" y="0" type="line"/>
-      <point x="276" y="0" type="line"/>
-      <point x="276" y="676" type="line"/>
-      <point x="529" y="676" type="line"/>
-      <point x="529" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
-      <point x="22" y="676" type="line"/>
-      <point x="255" y="676" type="line"/>
+      <point x="268" y="0" type="line"/>
+      <point x="289" y="0" type="line"/>
+      <point x="289" y="676" type="line"/>
+      <point x="542" y="676" type="line"/>
+      <point x="542" y="694" type="line"/>
+      <point x="35" y="694" type="line"/>
+      <point x="35" y="676" type="line"/>
+      <point x="268" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="670" y="0" type="line"/>
-      <point x="691" y="0" type="line"/>
-      <point x="691" y="239" type="line" smooth="yes"/>
-      <point x="691" y="346"/>
-      <point x="618" y="411"/>
-      <point x="484" y="411" type="curve" smooth="yes"/>
-      <point x="397" y="411"/>
-      <point x="308" y="384"/>
-      <point x="254" y="345" type="curve"/>
-      <point x="264" y="334" type="line"/>
-      <point x="312" y="367"/>
-      <point x="400" y="393"/>
-      <point x="481" y="393" type="curve" smooth="yes"/>
-      <point x="602" y="393"/>
-      <point x="670" y="336"/>
-      <point x="670" y="239" type="curve" smooth="yes"/>
+      <point x="683" y="0" type="line"/>
+      <point x="704" y="0" type="line"/>
+      <point x="704" y="239" type="line" smooth="yes"/>
+      <point x="704" y="346"/>
+      <point x="631" y="411"/>
+      <point x="497" y="411" type="curve" smooth="yes"/>
+      <point x="410" y="411"/>
+      <point x="321" y="384"/>
+      <point x="267" y="345" type="curve"/>
+      <point x="277" y="334" type="line"/>
+      <point x="325" y="367"/>
+      <point x="413" y="393"/>
+      <point x="494" y="393" type="curve" smooth="yes"/>
+      <point x="615" y="393"/>
+      <point x="683" y="336"/>
+      <point x="683" y="239" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
index 548f1f18..9f3d026d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U-cy" format="2">
-  <advance width="594"/>
+  <advance width="606"/>
   <unicode hex="0423"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="302" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="168" y="0" type="line"/>
-      <point x="191" y="0" type="line"/>
-      <point x="561" y="694" type="line"/>
-      <point x="537" y="694" type="line"/>
-      <point x="313" y="263" type="line"/>
-      <point x="306" y="253" type="line"/>
+      <point x="173" y="0" type="line"/>
+      <point x="196" y="0" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="542" y="694" type="line"/>
+      <point x="318" y="263" type="line"/>
+      <point x="311" y="253" type="line"/>
     </contour>
     <contour>
-      <point x="306" y="245" type="line"/>
-      <point x="317" y="263" type="line"/>
-      <point x="58" y="694" type="line"/>
-      <point x="33" y="694" type="line"/>
+      <point x="311" y="245" type="line"/>
+      <point x="322" y="263" type="line"/>
+      <point x="63" y="694" type="line"/>
+      <point x="38" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
index b6049222..e6063f23 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis-cy" format="2">
-  <advance width="594"/>
+  <advance width="606"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="77"/>
+    <component base="dieresiscomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
index 928b652c..ad0b0b4b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut-cy" format="2">
-  <advance width="594"/>
+  <advance width="606"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="125"/>
+    <component base="hungarumlautcomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
index 43af59f1..73c71759 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron-cy" format="2">
-  <advance width="594"/>
+  <advance width="606"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="59"/>
+    <component base="macroncomb.case" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
index 94ad5806..48b79187 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ushort-cy" format="2">
-  <advance width="594"/>
+  <advance width="606"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="104"/>
+    <component base="brevecomb-cy.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
index 5808553a..4ca95737 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="712"/>
+  <advance width="720"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
index de671061..c1210181 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yusbig-cy" format="2">
-  <advance width="754"/>
+  <advance width="770"/>
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="58" y="0" type="curve"/>
-      <point x="77" y="0" type="line"/>
-      <point x="77" y="250"/>
-      <point x="170" y="364"/>
-      <point x="373" y="364" type="curve" smooth="yes"/>
-      <point x="581" y="364"/>
-      <point x="677" y="250"/>
-      <point x="677" y="0" type="curve"/>
-      <point x="696" y="0" type="line"/>
-      <point x="696" y="262"/>
-      <point x="597" y="382"/>
-      <point x="380" y="382" type="curve" smooth="yes"/>
-      <point x="159" y="382"/>
-      <point x="58" y="262"/>
+      <point x="66" y="0" type="curve"/>
+      <point x="85" y="0" type="line"/>
+      <point x="85" y="250"/>
+      <point x="178" y="364"/>
+      <point x="381" y="364" type="curve" smooth="yes"/>
+      <point x="589" y="364"/>
+      <point x="685" y="250"/>
+      <point x="685" y="0" type="curve"/>
+      <point x="704" y="0" type="line"/>
+      <point x="704" y="262"/>
+      <point x="605" y="382"/>
+      <point x="388" y="382" type="curve" smooth="yes"/>
+      <point x="167" y="382"/>
+      <point x="66" y="262"/>
     </contour>
     <contour>
-      <point x="366" y="0" type="line"/>
-      <point x="386" y="0" type="line"/>
-      <point x="386" y="369" type="line"/>
-      <point x="366" y="369" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="394" y="0" type="line"/>
+      <point x="394" y="369" type="line"/>
+      <point x="374" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="355" y="381" type="line"/>
-      <point x="375" y="381" type="line"/>
-      <point x="124" y="683" type="line"/>
-      <point x="122" y="677" type="line"/>
-      <point x="631" y="677" type="line"/>
-      <point x="629" y="683" type="line"/>
-      <point x="373" y="381" type="line"/>
-      <point x="393" y="381" type="line"/>
-      <point x="649" y="676" type="line"/>
-      <point x="649" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="676" type="line"/>
+      <point x="363" y="381" type="line"/>
+      <point x="383" y="381" type="line"/>
+      <point x="132" y="683" type="line"/>
+      <point x="130" y="677" type="line"/>
+      <point x="639" y="677" type="line"/>
+      <point x="637" y="683" type="line"/>
+      <point x="381" y="381" type="line"/>
+      <point x="401" y="381" type="line"/>
+      <point x="657" y="676" type="line"/>
+      <point x="657" y="694" type="line"/>
+      <point x="112" y="694" type="line"/>
+      <point x="112" y="676" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
index 373d2b8d..fcc5b965 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ze-cy" format="2">
-  <advance width="582"/>
+  <advance width="600"/>
   <unicode hex="0417"/>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="291" y="694" name="top"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="298" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="272" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="507" y="61"/>
-      <point x="507" y="181" type="curve" smooth="yes"/>
-      <point x="507" y="293"/>
-      <point x="428" y="368"/>
-      <point x="309" y="369" type="curve"/>
-      <point x="319" y="364" type="line"/>
-      <point x="428" y="364"/>
-      <point x="492" y="424"/>
-      <point x="492" y="525" type="curve" smooth="yes"/>
-      <point x="492" y="637"/>
-      <point x="409" y="704"/>
-      <point x="269" y="704" type="curve" smooth="yes"/>
-      <point x="190" y="704"/>
-      <point x="123" y="683"/>
-      <point x="68" y="645" type="curve"/>
-      <point x="73" y="627" type="line"/>
-      <point x="137" y="666"/>
-      <point x="196" y="684"/>
-      <point x="264" y="684" type="curve" smooth="yes"/>
-      <point x="391" y="684"/>
-      <point x="469" y="622"/>
-      <point x="469" y="520" type="curve" smooth="yes"/>
-      <point x="469" y="428"/>
-      <point x="404" y="374"/>
-      <point x="292" y="374" type="curve" smooth="yes"/>
-      <point x="147" y="374" type="line"/>
-      <point x="147" y="355" type="line"/>
-      <point x="281" y="355" type="line" smooth="yes"/>
-      <point x="405" y="355"/>
-      <point x="485" y="286"/>
-      <point x="485" y="177" type="curve" smooth="yes"/>
-      <point x="485" y="72"/>
-      <point x="405" y="11"/>
-      <point x="274" y="11" type="curve" smooth="yes"/>
-      <point x="197" y="11"/>
-      <point x="117" y="31"/>
-      <point x="54" y="65" type="curve"/>
-      <point x="48" y="45" type="line"/>
-      <point x="110" y="11"/>
-      <point x="192" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="425" y="-10"/>
+      <point x="514" y="61"/>
+      <point x="514" y="181" type="curve" smooth="yes"/>
+      <point x="514" y="293"/>
+      <point x="435" y="368"/>
+      <point x="316" y="369" type="curve"/>
+      <point x="326" y="364" type="line"/>
+      <point x="435" y="364"/>
+      <point x="499" y="424"/>
+      <point x="499" y="525" type="curve" smooth="yes"/>
+      <point x="499" y="637"/>
+      <point x="416" y="704"/>
+      <point x="276" y="704" type="curve" smooth="yes"/>
+      <point x="197" y="704"/>
+      <point x="130" y="683"/>
+      <point x="75" y="645" type="curve"/>
+      <point x="80" y="627" type="line"/>
+      <point x="144" y="666"/>
+      <point x="203" y="684"/>
+      <point x="271" y="684" type="curve" smooth="yes"/>
+      <point x="398" y="684"/>
+      <point x="476" y="622"/>
+      <point x="476" y="520" type="curve" smooth="yes"/>
+      <point x="476" y="428"/>
+      <point x="411" y="374"/>
+      <point x="299" y="374" type="curve" smooth="yes"/>
+      <point x="154" y="374" type="line"/>
+      <point x="154" y="355" type="line"/>
+      <point x="288" y="355" type="line" smooth="yes"/>
+      <point x="412" y="355"/>
+      <point x="492" y="286"/>
+      <point x="492" y="177" type="curve" smooth="yes"/>
+      <point x="492" y="72"/>
+      <point x="412" y="11"/>
+      <point x="281" y="11" type="curve" smooth="yes"/>
+      <point x="204" y="11"/>
+      <point x="124" y="31"/>
+      <point x="61" y="65" type="curve"/>
+      <point x="55" y="45" type="line"/>
+      <point x="117" y="11"/>
+      <point x="199" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
index be1ae800..0be8c95a 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedescender-cy" format="2">
-  <advance width="582"/>
+  <advance width="600"/>
   <unicode hex="0498"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="cedillacomb" xOffset="166"/>
+    <component base="cedillacomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
index 62a87def..5d90e419 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedieresis-cy" format="2">
-  <advance width="582"/>
+  <advance width="600"/>
   <unicode hex="04DE"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="dieresiscomb.case" xOffset="71"/>
+    <component base="dieresiscomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
index cbcad008..26618d6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhe-cy" format="2">
-  <advance width="884"/>
+  <advance width="898"/>
   <unicode hex="0416"/>
-  <anchor x="841" y="0" name="bottomright"/>
-  <anchor x="442" y="694" name="top"/>
+  <anchor x="848" y="0" name="bottomright"/>
+  <anchor x="449" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="821" y="0" type="line"/>
-      <point x="847" y="0" type="line"/>
-      <point x="603" y="364" type="line"/>
-      <point x="603" y="354" type="line"/>
-      <point x="835" y="694" type="line"/>
-      <point x="808" y="694" type="line"/>
-      <point x="584" y="358" type="line"/>
+      <point x="828" y="0" type="line"/>
+      <point x="854" y="0" type="line"/>
+      <point x="610" y="364" type="line"/>
+      <point x="610" y="354" type="line"/>
+      <point x="842" y="694" type="line"/>
+      <point x="815" y="694" type="line"/>
+      <point x="591" y="358" type="line"/>
     </contour>
     <contour>
-      <point x="37" y="0" type="line"/>
-      <point x="63" y="0" type="line"/>
-      <point x="300" y="359" type="line"/>
-      <point x="77" y="694" type="line"/>
-      <point x="50" y="694" type="line"/>
-      <point x="281" y="354" type="line"/>
-      <point x="280" y="363" type="line"/>
+      <point x="44" y="0" type="line"/>
+      <point x="70" y="0" type="line"/>
+      <point x="307" y="359" type="line"/>
+      <point x="84" y="694" type="line"/>
+      <point x="57" y="694" type="line"/>
+      <point x="288" y="354" type="line"/>
+      <point x="287" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="452" y="0" type="line"/>
-      <point x="452" y="694" type="line"/>
-      <point x="432" y="694" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="459" y="0" type="line"/>
+      <point x="459" y="694" type="line"/>
+      <point x="439" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="278" y="349" type="line"/>
-      <point x="598" y="349" type="line"/>
-      <point x="598" y="367" type="line"/>
-      <point x="278" y="367" type="line"/>
+      <point x="285" y="349" type="line"/>
+      <point x="605" y="349" type="line"/>
+      <point x="605" y="367" type="line"/>
+      <point x="285" y="367" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
index 9a0da145..93253525 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhebreve-cy" format="2">
-  <advance width="884"/>
+  <advance width="898"/>
   <unicode hex="04C1"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="brevecomb-cy.case" xOffset="249"/>
+    <component base="brevecomb-cy.case" xOffset="256"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
index 94b75abd..ceb39102 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="928"/>
+  <advance width="958"/>
   <unicode hex="0496"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="descender-cy.case" xOffset="745"/>
+    <component base="descender-cy.case" xOffset="752"/>
   </outline>
   <lib>
     <dict>
@@ -12,6 +12,8 @@
       <string>Zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Zhe-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
index b0392449..05ee2d17 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_hedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedieresis-cy" format="2">
-  <advance width="884"/>
+  <advance width="898"/>
   <unicode hex="04DC"/>
   <outline>
     <component base="Zhe-cy"/>
-    <component base="dieresiscomb.case" xOffset="222"/>
+    <component base="dieresiscomb.case" xOffset="229"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ampersand.glif b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
index a0c3b46f..1564eecc 100644
--- a/src/Cantarell-Light.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="697"/>
+  <advance width="703"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="294" y="-12" type="curve" smooth="yes"/>
-      <point x="421" y="-12"/>
-      <point x="540" y="93"/>
-      <point x="613" y="271" type="curve"/>
-      <point x="597" y="279" type="line"/>
-      <point x="524" y="107"/>
-      <point x="413" y="6"/>
-      <point x="297" y="6" type="curve" smooth="yes"/>
-      <point x="198" y="6"/>
-      <point x="112" y="79"/>
-      <point x="112" y="186" type="curve" smooth="yes"/>
-      <point x="112" y="402"/>
-      <point x="461" y="367"/>
-      <point x="461" y="568" type="curve" smooth="yes"/>
-      <point x="461" y="649"/>
-      <point x="404" y="704"/>
-      <point x="322" y="704" type="curve" smooth="yes"/>
-      <point x="232" y="704"/>
-      <point x="172" y="637"/>
-      <point x="172" y="537" type="curve" smooth="yes"/>
-      <point x="172" y="411"/>
-      <point x="274" y="280"/>
-      <point x="584" y="-5" type="curve"/>
-      <point x="597" y="10" type="line"/>
-      <point x="290" y="295"/>
-      <point x="193" y="418"/>
-      <point x="193" y="538" type="curve" smooth="yes"/>
-      <point x="193" y="628"/>
-      <point x="243" y="686"/>
-      <point x="320" y="686" type="curve" smooth="yes"/>
-      <point x="391" y="686"/>
-      <point x="441" y="636"/>
-      <point x="441" y="567" type="curve" smooth="yes"/>
-      <point x="441" y="382"/>
-      <point x="91" y="412"/>
-      <point x="91" y="184" type="curve" smooth="yes"/>
-      <point x="91" y="65"/>
-      <point x="186" y="-12"/>
+      <point x="299" y="-12" type="curve" smooth="yes"/>
+      <point x="426" y="-12"/>
+      <point x="545" y="93"/>
+      <point x="618" y="271" type="curve"/>
+      <point x="602" y="279" type="line"/>
+      <point x="529" y="107"/>
+      <point x="418" y="6"/>
+      <point x="302" y="6" type="curve" smooth="yes"/>
+      <point x="203" y="6"/>
+      <point x="117" y="79"/>
+      <point x="117" y="186" type="curve" smooth="yes"/>
+      <point x="117" y="402"/>
+      <point x="466" y="367"/>
+      <point x="466" y="568" type="curve" smooth="yes"/>
+      <point x="466" y="649"/>
+      <point x="409" y="704"/>
+      <point x="327" y="704" type="curve" smooth="yes"/>
+      <point x="237" y="704"/>
+      <point x="177" y="637"/>
+      <point x="177" y="537" type="curve" smooth="yes"/>
+      <point x="177" y="411"/>
+      <point x="279" y="280"/>
+      <point x="589" y="-5" type="curve"/>
+      <point x="602" y="10" type="line"/>
+      <point x="295" y="295"/>
+      <point x="198" y="418"/>
+      <point x="198" y="538" type="curve" smooth="yes"/>
+      <point x="198" y="628"/>
+      <point x="248" y="686"/>
+      <point x="325" y="686" type="curve" smooth="yes"/>
+      <point x="396" y="686"/>
+      <point x="446" y="636"/>
+      <point x="446" y="567" type="curve" smooth="yes"/>
+      <point x="446" y="382"/>
+      <point x="96" y="412"/>
+      <point x="96" y="184" type="curve" smooth="yes"/>
+      <point x="96" y="65"/>
+      <point x="191" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/asterisk.glif b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
index 3f35d6fd..95a2ab9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
@@ -1,43 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="asterisk" format="2">
-  <advance width="461"/>
+  <advance width="479"/>
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="399" y="369" type="line"/>
-      <point x="411" y="387" type="line"/>
-      <point x="232" y="494" type="line"/>
-      <point x="225" y="484" type="line"/>
+      <point x="408" y="369" type="line"/>
+      <point x="420" y="387" type="line"/>
+      <point x="241" y="494" type="line"/>
+      <point x="234" y="484" type="line"/>
     </contour>
     <contour>
-      <point x="62" y="372" type="line"/>
-      <point x="232" y="487" type="line"/>
-      <point x="226" y="497" type="line"/>
-      <point x="50" y="390" type="line"/>
+      <point x="71" y="372" type="line"/>
+      <point x="241" y="487" type="line"/>
+      <point x="235" y="497" type="line"/>
+      <point x="59" y="390" type="line"/>
     </contour>
     <contour>
-      <point x="216" y="283" type="line"/>
-      <point x="237" y="283" type="line"/>
-      <point x="234" y="487" type="line"/>
-      <point x="220" y="487" type="line"/>
+      <point x="225" y="283" type="line"/>
+      <point x="246" y="283" type="line"/>
+      <point x="243" y="487" type="line"/>
+      <point x="229" y="487" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="484" type="line"/>
-      <point x="230" y="494" type="line"/>
-      <point x="63" y="608" type="line"/>
-      <point x="51" y="590" type="line"/>
+      <point x="234" y="484" type="line"/>
+      <point x="239" y="494" type="line"/>
+      <point x="72" y="608" type="line"/>
+      <point x="60" y="590" type="line"/>
     </contour>
     <contour>
-      <point x="220" y="487" type="line"/>
-      <point x="234" y="487" type="line"/>
-      <point x="237" y="694" type="line"/>
-      <point x="216" y="694" type="line"/>
+      <point x="229" y="487" type="line"/>
+      <point x="243" y="487" type="line"/>
+      <point x="246" y="694" type="line"/>
+      <point x="225" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="232" y="488" type="line"/>
-      <point x="409" y="585" type="line"/>
-      <point x="397" y="603" type="line"/>
-      <point x="226" y="497" type="line"/>
+      <point x="241" y="488" type="line"/>
+      <point x="418" y="585" type="line"/>
+      <point x="406" y="603" type="line"/>
+      <point x="235" y="497" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/backslash.glif b/src/Cantarell-Light.ufo/glyphs/backslash.glif
index 60bdba31..67d5aae2 100644
--- a/src/Cantarell-Light.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/backslash.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="backslash" format="2">
-  <advance width="293"/>
+  <advance width="303"/>
   <unicode hex="005C"/>
   <outline>
-    <component base="slash" xScale="-1" xOffset="293"/>
+    <component base="slash" xScale="-1" xOffset="303"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|slash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>slash</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/be-cy.glif b/src/Cantarell-Light.ufo/glyphs/be-cy.glif
index 8b942ccb..9805c202 100644
--- a/src/Cantarell-Light.ufo/glyphs/be-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/be-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="be-cy" format="2">
-  <advance width="515"/>
+  <advance width="551"/>
   <unicode hex="0431"/>
   <outline>
     <contour>
-      <point x="265" y="-10" type="curve" smooth="yes"/>
-      <point x="384" y="-10"/>
-      <point x="460" y="83"/>
-      <point x="460" y="222" type="curve" smooth="yes"/>
-      <point x="460" y="363"/>
-      <point x="390" y="446"/>
-      <point x="273" y="446" type="curve" smooth="yes"/>
-      <point x="183" y="446"/>
-      <point x="112" y="400"/>
-      <point x="81" y="322" type="curve"/>
-      <point x="81" y="292" type="line"/>
-      <point x="115" y="381"/>
-      <point x="180" y="428"/>
-      <point x="265" y="428" type="curve" smooth="yes"/>
-      <point x="374" y="428"/>
-      <point x="439" y="353"/>
-      <point x="439" y="220" type="curve" smooth="yes"/>
-      <point x="439" y="91"/>
-      <point x="372" y="8"/>
-      <point x="266" y="8" type="curve" smooth="yes"/>
-      <point x="149" y="8"/>
-      <point x="89" y="115"/>
-      <point x="89" y="322" type="curve" smooth="yes"/>
-      <point x="89" y="560"/>
-      <point x="138" y="643"/>
-      <point x="299" y="678" type="curve" smooth="yes"/>
-      <point x="409" y="702" type="line"/>
-      <point x="404" y="720" type="line"/>
-      <point x="293" y="696" type="line" smooth="yes"/>
-      <point x="126" y="660"/>
-      <point x="69" y="563"/>
-      <point x="69" y="316" type="curve" smooth="yes"/>
-      <point x="69" y="101"/>
-      <point x="135" y="-10"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="402" y="-10"/>
+      <point x="478" y="83"/>
+      <point x="478" y="222" type="curve" smooth="yes"/>
+      <point x="478" y="363"/>
+      <point x="408" y="446"/>
+      <point x="291" y="446" type="curve" smooth="yes"/>
+      <point x="201" y="446"/>
+      <point x="130" y="400"/>
+      <point x="99" y="322" type="curve"/>
+      <point x="99" y="292" type="line"/>
+      <point x="133" y="381"/>
+      <point x="198" y="428"/>
+      <point x="283" y="428" type="curve" smooth="yes"/>
+      <point x="392" y="428"/>
+      <point x="457" y="353"/>
+      <point x="457" y="220" type="curve" smooth="yes"/>
+      <point x="457" y="91"/>
+      <point x="390" y="8"/>
+      <point x="284" y="8" type="curve" smooth="yes"/>
+      <point x="167" y="8"/>
+      <point x="107" y="115"/>
+      <point x="107" y="322" type="curve" smooth="yes"/>
+      <point x="107" y="560"/>
+      <point x="156" y="643"/>
+      <point x="317" y="678" type="curve" smooth="yes"/>
+      <point x="427" y="702" type="line"/>
+      <point x="422" y="720" type="line"/>
+      <point x="311" y="696" type="line" smooth="yes"/>
+      <point x="144" y="660"/>
+      <point x="87" y="563"/>
+      <point x="87" y="316" type="curve" smooth="yes"/>
+      <point x="87" y="101"/>
+      <point x="153" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/braceleft.glif b/src/Cantarell-Light.ufo/glyphs/braceleft.glif
index fd87271b..63814f60 100644
--- a/src/Cantarell-Light.ufo/glyphs/braceleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/braceleft.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceleft" format="2">
-  <advance width="305"/>
+  <advance width="327"/>
   <unicode hex="007B"/>
   <outline>
     <contour>
-      <point x="274" y="-189" type="curve"/>
-      <point x="277" y="-172" type="line"/>
-      <point x="186" y="-172"/>
-      <point x="141" y="-129"/>
-      <point x="151" y="-53" type="curve" smooth="yes"/>
-      <point x="171" y="107" type="line" smooth="yes"/>
-      <point x="180" y="178"/>
-      <point x="139" y="250"/>
-      <point x="76" y="272" type="curve"/>
-      <point x="76" y="271" type="line"/>
-      <point x="140" y="291"/>
-      <point x="180" y="360"/>
-      <point x="172" y="431" type="curve" smooth="yes"/>
-      <point x="152" y="608" type="line" smooth="yes"/>
-      <point x="143" y="688"/>
-      <point x="186" y="732"/>
-      <point x="277" y="732" type="curve"/>
-      <point x="274" y="749" type="line"/>
-      <point x="170" y="749"/>
-      <point x="120" y="695"/>
-      <point x="131" y="598" type="curve" smooth="yes"/>
-      <point x="151" y="421" type="line" smooth="yes"/>
-      <point x="158" y="358"/>
-      <point x="119" y="299"/>
-      <point x="57" y="283" type="curve"/>
-      <point x="57" y="260" type="line"/>
-      <point x="119" y="246"/>
-      <point x="161" y="173"/>
-      <point x="151" y="97" type="curve" smooth="yes"/>
-      <point x="131" y="-63" type="line" smooth="yes"/>
-      <point x="121" y="-144"/>
-      <point x="172" y="-189"/>
+      <point x="272" y="-189" type="curve"/>
+      <point x="275" y="-172" type="line"/>
+      <point x="184" y="-172"/>
+      <point x="139" y="-129"/>
+      <point x="149" y="-53" type="curve" smooth="yes"/>
+      <point x="169" y="107" type="line" smooth="yes"/>
+      <point x="178" y="178"/>
+      <point x="137" y="250"/>
+      <point x="74" y="272" type="curve"/>
+      <point x="74" y="271" type="line"/>
+      <point x="138" y="291"/>
+      <point x="178" y="360"/>
+      <point x="170" y="431" type="curve" smooth="yes"/>
+      <point x="150" y="608" type="line" smooth="yes"/>
+      <point x="141" y="688"/>
+      <point x="184" y="732"/>
+      <point x="275" y="732" type="curve"/>
+      <point x="272" y="749" type="line"/>
+      <point x="168" y="749"/>
+      <point x="118" y="695"/>
+      <point x="129" y="598" type="curve" smooth="yes"/>
+      <point x="149" y="421" type="line" smooth="yes"/>
+      <point x="156" y="358"/>
+      <point x="117" y="299"/>
+      <point x="55" y="283" type="curve"/>
+      <point x="55" y="260" type="line"/>
+      <point x="117" y="246"/>
+      <point x="159" y="173"/>
+      <point x="149" y="97" type="curve" smooth="yes"/>
+      <point x="129" y="-63" type="line" smooth="yes"/>
+      <point x="119" y="-144"/>
+      <point x="170" y="-189"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/braceright.glif b/src/Cantarell-Light.ufo/glyphs/braceright.glif
index c00bbbf8..01bf72d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/braceright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/braceright.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="braceright" format="2">
-  <advance width="305"/>
+  <advance width="327"/>
   <unicode hex="007D"/>
   <outline>
-    <component base="braceleft" xScale="-1" yScale="-1" xOffset="305" yOffset="560"/>
+    <component base="braceleft" xScale="-1" yScale="-1" xOffset="327" yOffset="560"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/bracketleft.glif b/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
index 4c204eb5..131ec8c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bracketleft.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketleft" format="2">
-  <advance width="308"/>
+  <advance width="345"/>
   <unicode hex="005B"/>
   <outline>
     <contour>
-      <point x="105" y="-180" type="line"/>
-      <point x="270" y="-180" type="line"/>
-      <point x="270" y="-163" type="line"/>
-      <point x="125" y="-163" type="line"/>
-      <point x="125" y="722" type="line"/>
-      <point x="270" y="722" type="line"/>
-      <point x="270" y="739" type="line"/>
-      <point x="105" y="739" type="line"/>
+      <point x="128" y="-180" type="line"/>
+      <point x="293" y="-180" type="line"/>
+      <point x="293" y="-163" type="line"/>
+      <point x="148" y="-163" type="line"/>
+      <point x="148" y="722" type="line"/>
+      <point x="293" y="722" type="line"/>
+      <point x="293" y="739" type="line"/>
+      <point x="128" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bracketright.glif 
b/src/Cantarell-Light.ufo/glyphs/bracketright.glif
index 04a93965..6e6b5f38 100644
--- a/src/Cantarell-Light.ufo/glyphs/bracketright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bracketright.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bracketright" format="2">
-  <advance width="308"/>
+  <advance width="345"/>
   <unicode hex="005D"/>
   <outline>
-    <component base="bracketleft" xScale="-1" xOffset="308"/>
+    <component base="bracketleft" xScale="-1" xOffset="345"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/bullet.glif b/src/Cantarell-Light.ufo/glyphs/bullet.glif
index 1665b58d..f5f267e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bullet.glif
@@ -1,21 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bullet" format="2">
-  <advance width="252"/>
+  <advance width="290"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
-      <point x="126" y="309" type="curve" smooth="yes"/>
-      <point x="154" y="309"/>
-      <point x="172" y="329"/>
-      <point x="172" y="355" type="curve" smooth="yes"/>
-      <point x="172" y="383"/>
-      <point x="154" y="403"/>
-      <point x="126" y="403" type="curve" smooth="yes"/>
-      <point x="98" y="403"/>
-      <point x="80" y="383"/>
-      <point x="80" y="355" type="curve" smooth="yes"/>
-      <point x="80" y="329"/>
-      <point x="98" y="309"/>
+      <point x="145" y="309" type="curve" smooth="yes"/>
+      <point x="173" y="309"/>
+      <point x="191" y="329"/>
+      <point x="191" y="355" type="curve" smooth="yes"/>
+      <point x="191" y="383"/>
+      <point x="173" y="403"/>
+      <point x="145" y="403" type="curve" smooth="yes"/>
+      <point x="117" y="403"/>
+      <point x="99" y="383"/>
+      <point x="99" y="355" type="curve" smooth="yes"/>
+      <point x="99" y="329"/>
+      <point x="117" y="309"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif 
b/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
index 2d6ec917..94021d61 100644
--- a/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bulletoperator.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bulletoperator" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="2219"/>
   <outline>
     <component base="period" yOffset="323"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/che-cy.glif b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
index 368ace7b..361de341 100644
--- a/src/Cantarell-Light.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="che-cy" format="2">
-  <advance width="504"/>
+  <advance width="516"/>
   <unicode hex="0447"/>
-  <anchor x="424" y="0" name="bottomright"/>
-  <anchor x="242" y="480" name="top"/>
+  <anchor x="436" y="0" name="bottomright"/>
+  <anchor x="254" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="215" y="181" type="curve" smooth="yes"/>
-      <point x="277" y="181"/>
-      <point x="347" y="198"/>
-      <point x="392" y="228" type="curve"/>
-      <point x="384" y="239" type="line"/>
-      <point x="348" y="216"/>
-      <point x="279" y="199"/>
-      <point x="218" y="199" type="curve" smooth="yes"/>
-      <point x="129" y="199"/>
-      <point x="74" y="237"/>
-      <point x="74" y="301" type="curve" smooth="yes"/>
-      <point x="74" y="480" type="line"/>
-      <point x="53" y="480" type="line"/>
-      <point x="53" y="300" type="line" smooth="yes"/>
-      <point x="53" y="225"/>
-      <point x="115" y="181"/>
+      <point x="227" y="181" type="curve" smooth="yes"/>
+      <point x="289" y="181"/>
+      <point x="359" y="198"/>
+      <point x="404" y="228" type="curve"/>
+      <point x="396" y="239" type="line"/>
+      <point x="360" y="216"/>
+      <point x="291" y="199"/>
+      <point x="230" y="199" type="curve" smooth="yes"/>
+      <point x="141" y="199"/>
+      <point x="86" y="237"/>
+      <point x="86" y="301" type="curve" smooth="yes"/>
+      <point x="86" y="480" type="line"/>
+      <point x="65" y="480" type="line"/>
+      <point x="65" y="300" type="line" smooth="yes"/>
+      <point x="65" y="225"/>
+      <point x="127" y="181"/>
     </contour>
     <contour>
-      <point x="377" y="0" type="line"/>
-      <point x="397" y="0" type="line"/>
-      <point x="397" y="480" type="line"/>
-      <point x="377" y="480" type="line"/>
+      <point x="389" y="0" type="line"/>
+      <point x="409" y="0" type="line"/>
+      <point x="409" y="480" type="line"/>
+      <point x="389" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
index e60d5619..18d674c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chedescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedescender-cy" format="2">
-  <advance width="492"/>
+  <advance width="518"/>
   <unicode hex="04B7"/>
   <outline>
     <component base="che-cy"/>
-    <component base="descender-cy" xOffset="328"/>
+    <component base="descender-cy" xOffset="340"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
index be777c9b..46c6d5e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedieresis-cy" format="2">
-  <advance width="504"/>
+  <advance width="516"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
-    <component base="dieresiscomb" xOffset="23"/>
+    <component base="dieresiscomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
index c5a957ae..8c86ac9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chekhakassian-cy" format="2">
-  <advance width="504"/>
+  <advance width="516"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
-    <component base="_descenderreversed-cy" xOffset="271"/>
+    <component base="_descenderreversed-cy" xOffset="283"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
index b83cafe4..d17eb3c3 100644
--- a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,41 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="519"/>
+  <advance width="531"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="222" y="181" type="curve" smooth="yes"/>
-      <point x="289" y="181"/>
-      <point x="362" y="199"/>
-      <point x="407" y="228" type="curve"/>
-      <point x="399" y="239" type="line"/>
-      <point x="360" y="215"/>
-      <point x="286" y="199"/>
-      <point x="225" y="199" type="curve" smooth="yes"/>
-      <point x="131" y="199"/>
-      <point x="74" y="237"/>
-      <point x="74" y="301" type="curve" smooth="yes"/>
-      <point x="74" y="480" type="line"/>
-      <point x="53" y="480" type="line"/>
-      <point x="53" y="300" type="line" smooth="yes"/>
-      <point x="53" y="225"/>
-      <point x="117" y="181"/>
+      <point x="234" y="181" type="curve" smooth="yes"/>
+      <point x="301" y="181"/>
+      <point x="374" y="199"/>
+      <point x="419" y="228" type="curve"/>
+      <point x="411" y="239" type="line"/>
+      <point x="372" y="215"/>
+      <point x="298" y="199"/>
+      <point x="237" y="199" type="curve" smooth="yes"/>
+      <point x="143" y="199"/>
+      <point x="86" y="237"/>
+      <point x="86" y="301" type="curve" smooth="yes"/>
+      <point x="86" y="480" type="line"/>
+      <point x="65" y="480" type="line"/>
+      <point x="65" y="300" type="line" smooth="yes"/>
+      <point x="65" y="225"/>
+      <point x="129" y="181"/>
     </contour>
     <contour>
-      <point x="218" y="51" type="line"/>
-      <point x="237" y="51" type="line"/>
-      <point x="237" y="351" type="line"/>
-      <point x="218" y="351" type="line"/>
+      <point x="230" y="51" type="line"/>
+      <point x="249" y="51" type="line"/>
+      <point x="249" y="351" type="line"/>
+      <point x="230" y="351" type="line"/>
     </contour>
     <contour>
-      <point x="392" y="0" type="line"/>
-      <point x="412" y="0" type="line"/>
-      <point x="412" y="480" type="line"/>
-      <point x="392" y="480" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="424" y="0" type="line"/>
+      <point x="424" y="480" type="line"/>
+      <point x="404" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>en-cy</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/colon.glif b/src/Cantarell-Light.ufo/glyphs/colon.glif
index f4e2b5b9..d6700235 100644
--- a/src/Cantarell-Light.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/colon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="colon" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="003A"/>
   <outline>
     <component base="period"/>
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/comma.glif b/src/Cantarell-Light.ufo/glyphs/comma.glif
index 275f828d..2ab5b563 100644
--- a/src/Cantarell-Light.ufo/glyphs/comma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/comma.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="comma" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="002C"/>
   <outline>
     <contour>
-      <point x="51" y="-170" type="curve"/>
-      <point x="70" y="-170" type="line"/>
-      <point x="98" y="-95"/>
-      <point x="115" y="6"/>
-      <point x="115" y="103" type="curve"/>
-      <point x="91" y="103" type="line"/>
-      <point x="91" y="3"/>
-      <point x="76" y="-97"/>
+      <point x="76" y="-170" type="curve"/>
+      <point x="95" y="-170" type="line"/>
+      <point x="123" y="-95"/>
+      <point x="140" y="6"/>
+      <point x="140" y="103" type="curve"/>
+      <point x="116" y="103" type="line"/>
+      <point x="116" y="3"/>
+      <point x="101" y="-97"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dagger.glif b/src/Cantarell-Light.ufo/glyphs/dagger.glif
index 40e778c8..5c6616ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="426"/>
+  <advance width="430"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="201" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="220" y="526" type="line"/>
-      <point x="223" y="694" type="line"/>
-      <point x="201" y="694" type="line"/>
-      <point x="203" y="526" type="line"/>
+      <point x="203" y="0" type="line"/>
+      <point x="225" y="0" type="line"/>
+      <point x="222" y="526" type="line"/>
+      <point x="225" y="694" type="line"/>
+      <point x="203" y="694" type="line"/>
+      <point x="205" y="526" type="line"/>
     </contour>
     <contour>
-      <point x="78" y="517" type="line"/>
-      <point x="208" y="519" type="line"/>
-      <point x="208" y="533" type="line"/>
-      <point x="78" y="536" type="line"/>
+      <point x="80" y="517" type="line"/>
+      <point x="210" y="519" type="line"/>
+      <point x="210" y="533" type="line"/>
+      <point x="80" y="536" type="line"/>
     </contour>
     <contour>
-      <point x="348" y="517" type="line"/>
-      <point x="348" y="536" type="line"/>
-      <point x="214" y="533" type="line"/>
-      <point x="214" y="519" type="line"/>
+      <point x="350" y="517" type="line"/>
+      <point x="350" y="536" type="line"/>
+      <point x="216" y="533" type="line"/>
+      <point x="216" y="519" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
index 62442448..604a1289 100644
--- a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="426"/>
+  <advance width="440"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="202" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="220" y="175" type="line"/>
-      <point x="223" y="346" type="line"/>
-      <point x="220" y="506" type="line"/>
-      <point x="223" y="694" type="line"/>
-      <point x="202" y="694" type="line"/>
-      <point x="204" y="506" type="line"/>
-      <point x="201" y="346" type="line"/>
-      <point x="204" y="175" type="line"/>
+      <point x="209" y="0" type="line"/>
+      <point x="230" y="0" type="line"/>
+      <point x="227" y="175" type="line"/>
+      <point x="230" y="346" type="line"/>
+      <point x="227" y="506" type="line"/>
+      <point x="230" y="694" type="line"/>
+      <point x="209" y="694" type="line"/>
+      <point x="211" y="506" type="line"/>
+      <point x="208" y="346" type="line"/>
+      <point x="211" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="165" type="line"/>
-      <point x="208" y="167" type="line"/>
-      <point x="208" y="181" type="line"/>
-      <point x="88" y="184" type="line"/>
-    </contour>
-    <contour>
-      <point x="338" y="165" type="line"/>
-      <point x="338" y="184" type="line"/>
-      <point x="215" y="181" type="line"/>
+      <point x="95" y="165" type="line"/>
       <point x="215" y="167" type="line"/>
+      <point x="215" y="181" type="line"/>
+      <point x="95" y="184" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="511" type="line"/>
-      <point x="208" y="513" type="line"/>
-      <point x="208" y="527" type="line"/>
-      <point x="88" y="530" type="line"/>
+      <point x="345" y="165" type="line"/>
+      <point x="345" y="184" type="line"/>
+      <point x="222" y="181" type="line"/>
+      <point x="222" y="167" type="line"/>
     </contour>
     <contour>
-      <point x="338" y="511" type="line"/>
-      <point x="338" y="530" type="line"/>
-      <point x="215" y="527" type="line"/>
+      <point x="95" y="511" type="line"/>
       <point x="215" y="513" type="line"/>
+      <point x="215" y="527" type="line"/>
+      <point x="95" y="530" type="line"/>
+    </contour>
+    <contour>
+      <point x="345" y="511" type="line"/>
+      <point x="345" y="530" type="line"/>
+      <point x="222" y="527" type="line"/>
+      <point x="222" y="513" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/de-cy.glif b/src/Cantarell-Light.ufo/glyphs/de-cy.glif
index a4dbdbf3..4e068b13 100644
--- a/src/Cantarell-Light.ufo/glyphs/de-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/de-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="de-cy" format="2">
-  <advance width="515"/>
+  <advance width="536"/>
   <unicode hex="0434"/>
   <outline>
     <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="124" y="0"/>
-      <point x="166" y="95"/>
-      <point x="166" y="278" type="curve" smooth="yes"/>
-      <point x="166" y="463" type="line"/>
-      <point x="397" y="463" type="line"/>
-      <point x="397" y="4" type="line"/>
-      <point x="416" y="4" type="line"/>
-      <point x="416" y="480" type="line"/>
-      <point x="147" y="480" type="line"/>
-      <point x="147" y="279" type="line" smooth="yes"/>
-      <point x="147" y="106"/>
-      <point x="110" y="16"/>
-      <point x="41" y="16" type="curve"/>
+      <point x="51" y="0" type="line"/>
+      <point x="131" y="0"/>
+      <point x="173" y="95"/>
+      <point x="173" y="278" type="curve" smooth="yes"/>
+      <point x="173" y="463" type="line"/>
+      <point x="404" y="463" type="line"/>
+      <point x="404" y="4" type="line"/>
+      <point x="423" y="4" type="line"/>
+      <point x="423" y="480" type="line"/>
+      <point x="154" y="480" type="line"/>
+      <point x="154" y="279" type="line" smooth="yes"/>
+      <point x="154" y="106"/>
+      <point x="117" y="16"/>
+      <point x="48" y="16" type="curve"/>
     </contour>
     <contour>
-      <point x="24" y="-121" type="line"/>
-      <point x="42" y="-121" type="line"/>
-      <point x="42" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
-      <point x="460" y="-121" type="line"/>
-      <point x="478" y="-121" type="line"/>
-      <point x="478" y="17" type="line"/>
-      <point x="24" y="17" type="line"/>
+      <point x="31" y="-121" type="line"/>
+      <point x="49" y="-121" type="line"/>
+      <point x="49" y="0" type="line"/>
+      <point x="467" y="0" type="line"/>
+      <point x="467" y="-121" type="line"/>
+      <point x="485" y="-121" type="line"/>
+      <point x="485" y="17" type="line"/>
+      <point x="31" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
index 77faf079..ec43bc39 100644
--- a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0452"/>
   <outline>
     <component base="tshe-cy"/>
-    <component base="_bottomhook" xOffset="-15"/>
+    <component base="_bottomhook" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
index 41f830db..e017d335 100644
--- a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="640"/>
+  <advance width="646"/>
   <unicode hex="2193"/>
   <note>
 arrowdown
 </note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="640" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="646" yOffset="642"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
index 9f373558..a3da0ad9 100644
--- a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dze-cy" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="0455"/>
   <outline>
     <component base="s"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/el-cy.glif b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
index f7511c95..1a1a8cba 100644
--- a/src/Cantarell-Light.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="el-cy" format="2">
-  <advance width="560"/>
+  <advance width="564"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
-      <point x="74" y="-7" type="curve" smooth="yes"/>
-      <point x="140" y="-7"/>
-      <point x="173" y="75"/>
-      <point x="173" y="221" type="curve" smooth="yes"/>
-      <point x="173" y="463" type="line"/>
-      <point x="433" y="463" type="line"/>
-      <point x="433" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="154" y="480" type="line"/>
-      <point x="154" y="212" type="line" smooth="yes"/>
-      <point x="154" y="83"/>
-      <point x="127" y="10"/>
-      <point x="72" y="10" type="curve" smooth="yes"/>
-      <point x="61" y="10"/>
-      <point x="46" y="14"/>
-      <point x="27" y="27" type="curve"/>
-      <point x="20" y="13" type="line"/>
-      <point x="33" y="1"/>
-      <point x="54" y="-7"/>
+      <point x="78" y="-7" type="curve" smooth="yes"/>
+      <point x="144" y="-7"/>
+      <point x="177" y="75"/>
+      <point x="177" y="221" type="curve" smooth="yes"/>
+      <point x="177" y="463" type="line"/>
+      <point x="437" y="463" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="480" type="line"/>
+      <point x="158" y="480" type="line"/>
+      <point x="158" y="212" type="line" smooth="yes"/>
+      <point x="158" y="83"/>
+      <point x="131" y="10"/>
+      <point x="76" y="10" type="curve" smooth="yes"/>
+      <point x="65" y="10"/>
+      <point x="50" y="14"/>
+      <point x="31" y="27" type="curve"/>
+      <point x="24" y="13" type="line"/>
+      <point x="37" y="1"/>
+      <point x="58" y="-7"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/emptyset.glif b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
index 49c40a7c..952bf094 100644
--- a/src/Cantarell-Light.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="744"/>
+  <advance width="766"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="177" y="48" type="line"/>
-      <point x="581" y="647" type="line"/>
-      <point x="567" y="657" type="line"/>
-      <point x="163" y="58" type="line"/>
+      <point x="188" y="48" type="line"/>
+      <point x="592" y="647" type="line"/>
+      <point x="578" y="657" type="line"/>
+      <point x="174" y="58" type="line"/>
     </contour>
     <contour>
-      <point x="371" y="74" type="curve" smooth="yes"/>
-      <point x="533" y="74"/>
-      <point x="641" y="181"/>
-      <point x="641" y="342" type="curve" smooth="yes"/>
-      <point x="641" y="502"/>
-      <point x="534" y="609"/>
-      <point x="373" y="609" type="curve" smooth="yes"/>
-      <point x="211" y="609"/>
-      <point x="103" y="501"/>
-      <point x="103" y="340" type="curve" smooth="yes"/>
-      <point x="103" y="180"/>
-      <point x="210" y="74"/>
+      <point x="382" y="74" type="curve" smooth="yes"/>
+      <point x="544" y="74"/>
+      <point x="652" y="181"/>
+      <point x="652" y="342" type="curve" smooth="yes"/>
+      <point x="652" y="502"/>
+      <point x="545" y="609"/>
+      <point x="384" y="609" type="curve" smooth="yes"/>
+      <point x="222" y="609"/>
+      <point x="114" y="501"/>
+      <point x="114" y="340" type="curve" smooth="yes"/>
+      <point x="114" y="180"/>
+      <point x="221" y="74"/>
     </contour>
     <contour>
-      <point x="373" y="92" type="curve" smooth="yes"/>
-      <point x="223" y="92"/>
-      <point x="123" y="192"/>
-      <point x="123" y="342" type="curve" smooth="yes"/>
-      <point x="123" y="491"/>
-      <point x="222" y="591"/>
-      <point x="370" y="591" type="curve" smooth="yes"/>
-      <point x="521" y="591"/>
-      <point x="621" y="491"/>
-      <point x="621" y="340" type="curve" smooth="yes"/>
-      <point x="621" y="191"/>
-      <point x="522" y="92"/>
+      <point x="384" y="92" type="curve" smooth="yes"/>
+      <point x="234" y="92"/>
+      <point x="134" y="192"/>
+      <point x="134" y="342" type="curve" smooth="yes"/>
+      <point x="134" y="491"/>
+      <point x="233" y="591"/>
+      <point x="381" y="591" type="curve" smooth="yes"/>
+      <point x="532" y="591"/>
+      <point x="632" y="491"/>
+      <point x="632" y="340" type="curve" smooth="yes"/>
+      <point x="632" y="191"/>
+      <point x="533" y="92"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
index 102fbb74..d3f0b646 100644
--- a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="559"/>
+  <advance width="573"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
index f264ec66..fe482f25 100644
--- a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="667"/>
+  <advance width="671"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/estimated.glif b/src/Cantarell-Light.ufo/glyphs/estimated.glif
index 59312eb6..a52ba08a 100644
--- a/src/Cantarell-Light.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Light.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="893"/>
+  <advance width="912"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="450" y="-10" type="curve" smooth="yes"/>
-      <point x="581" y="-10"/>
-      <point x="705" y="42"/>
-      <point x="777" y="119" type="curve"/>
-      <point x="711" y="119" type="line"/>
-      <point x="639" y="62"/>
-      <point x="547" y="36"/>
-      <point x="458" y="36" type="curve" smooth="yes"/>
-      <point x="336" y="36"/>
-      <point x="262" y="84"/>
-      <point x="215" y="145" type="curve"/>
-      <point x="215" y="315" type="line"/>
-      <point x="798" y="315" type="line"/>
-      <point x="798" y="545"/>
-      <point x="681" y="704"/>
-      <point x="453" y="704" type="curve" smooth="yes"/>
-      <point x="222" y="704"/>
-      <point x="104" y="541"/>
-      <point x="104" y="339" type="curve" smooth="yes"/>
-      <point x="104" y="123"/>
-      <point x="240" y="-10"/>
+      <point x="460" y="-10" type="curve" smooth="yes"/>
+      <point x="591" y="-10"/>
+      <point x="715" y="42"/>
+      <point x="787" y="119" type="curve"/>
+      <point x="721" y="119" type="line"/>
+      <point x="649" y="62"/>
+      <point x="557" y="36"/>
+      <point x="468" y="36" type="curve" smooth="yes"/>
+      <point x="346" y="36"/>
+      <point x="272" y="84"/>
+      <point x="225" y="145" type="curve"/>
+      <point x="225" y="315" type="line"/>
+      <point x="808" y="315" type="line"/>
+      <point x="808" y="545"/>
+      <point x="691" y="704"/>
+      <point x="463" y="704" type="curve" smooth="yes"/>
+      <point x="232" y="704"/>
+      <point x="114" y="541"/>
+      <point x="114" y="339" type="curve" smooth="yes"/>
+      <point x="114" y="123"/>
+      <point x="250" y="-10"/>
     </contour>
     <contour>
-      <point x="215" y="358" type="line"/>
-      <point x="215" y="535" type="line"/>
-      <point x="261" y="619"/>
-      <point x="336" y="662"/>
-      <point x="450" y="662" type="curve" smooth="yes"/>
-      <point x="564" y="662"/>
-      <point x="638" y="619"/>
-      <point x="684" y="535" type="curve"/>
-      <point x="684" y="358" type="line"/>
+      <point x="225" y="358" type="line"/>
+      <point x="225" y="535" type="line"/>
+      <point x="271" y="619"/>
+      <point x="346" y="662"/>
+      <point x="460" y="662" type="curve" smooth="yes"/>
+      <point x="574" y="662"/>
+      <point x="648" y="619"/>
+      <point x="694" y="535" type="curve"/>
+      <point x="694" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/exclam.glif b/src/Cantarell-Light.ufo/glyphs/exclam.glif
index 5e325349..304db523 100644
--- a/src/Cantarell-Light.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Light.ufo/glyphs/exclam.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclam" format="2">
-  <advance width="214"/>
+  <advance width="255"/>
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="98" y="155" type="line"/>
-      <point x="115" y="155" type="line"/>
-      <point x="117" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="118" y="155" type="line"/>
+      <point x="135" y="155" type="line"/>
+      <point x="137" y="694" type="line"/>
+      <point x="116" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="109" y="-10" type="curve" smooth="yes"/>
-      <point x="123" y="-10"/>
-      <point x="132" y="0"/>
-      <point x="132" y="13" type="curve" smooth="yes"/>
-      <point x="132" y="27"/>
-      <point x="123" y="37"/>
-      <point x="109" y="37" type="curve" smooth="yes"/>
-      <point x="95" y="37"/>
-      <point x="86" y="27"/>
-      <point x="86" y="13" type="curve" smooth="yes"/>
-      <point x="86" y="0"/>
-      <point x="95" y="-10"/>
+      <point x="128" y="-10" type="curve" smooth="yes"/>
+      <point x="142" y="-10"/>
+      <point x="151" y="0"/>
+      <point x="151" y="13" type="curve" smooth="yes"/>
+      <point x="151" y="27"/>
+      <point x="142" y="37"/>
+      <point x="128" y="37" type="curve" smooth="yes"/>
+      <point x="114" y="37"/>
+      <point x="105" y="27"/>
+      <point x="105" y="13" type="curve" smooth="yes"/>
+      <point x="105" y="0"/>
+      <point x="114" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/exclamdown.glif b/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
index 533ea7f5..f3b86fa9 100644
--- a/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Light.ufo/glyphs/exclamdown.glif
@@ -1,13 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="exclamdown" format="2">
-  <advance width="214"/>
+  <advance width="255"/>
   <unicode hex="00A1"/>
   <outline>
     <component base="exclam" yScale="-1" yOffset="470"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>exclam</string>
     </dict>
   </lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/figuredash.glif b/src/Cantarell-Light.ufo/glyphs/figuredash.glif
index 14821fb9..06d6fa9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/figuredash.glif
@@ -1,13 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="figuredash" format="2">
-  <advance width="656"/>
+  <advance width="580"/>
   <unicode hex="2012"/>
   <outline>
     <contour>
-      <point x="78" y="240" type="line"/>
-      <point x="578" y="240" type="line"/>
-      <point x="578" y="257" type="line"/>
-      <point x="78" y="257" type="line"/>
+      <point x="40" y="240" type="line"/>
+      <point x="540" y="240" type="line"/>
+      <point x="540" y="257" type="line"/>
+      <point x="40" y="257" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fl.glif b/src/Cantarell-Light.ufo/glyphs/fl.glif
index 7474bb47..a1113721 100644
--- a/src/Cantarell-Light.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="578"/>
+  <advance width="583"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.glif b/src/Cantarell-Light.ufo/glyphs/four.glif
index 444b5164..99e07bed 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four" format="2">
-  <advance width="577"/>
+  <advance width="565"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
-      <point x="399" y="-10" type="line"/>
-      <point x="417" y="-10" type="line"/>
-      <point x="417" y="694" type="line"/>
-      <point x="400" y="694" type="line"/>
-      <point x="39" y="200" type="line"/>
-      <point x="39" y="190" type="line"/>
-      <point x="540" y="190" type="line"/>
-      <point x="540" y="207" type="line"/>
-      <point x="61" y="207" type="line"/>
-      <point x="61" y="202" type="line"/>
-      <point x="399" y="667" type="line"/>
-      <point x="399" y="665" type="line"/>
+      <point x="393" y="-10" type="line"/>
+      <point x="411" y="-10" type="line"/>
+      <point x="411" y="694" type="line"/>
+      <point x="394" y="694" type="line"/>
+      <point x="33" y="200" type="line"/>
+      <point x="33" y="190" type="line"/>
+      <point x="534" y="190" type="line"/>
+      <point x="534" y="207" type="line"/>
+      <point x="55" y="207" type="line"/>
+      <point x="55" y="202" type="line"/>
+      <point x="393" y="667" type="line"/>
+      <point x="393" y="665" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/four.osf.glif b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
index a5101cb9..b0b54bd0 100644
--- a/src/Cantarell-Light.ufo/glyphs/four.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/four.osf.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four.osf" format="2">
-  <advance width="572"/>
+  <advance width="560"/>
   <outline>
     <contour>
-      <point x="395" y="-110" type="line"/>
-      <point x="413" y="-110" type="line"/>
-      <point x="413" y="594" type="line"/>
-      <point x="396" y="594" type="line"/>
-      <point x="39" y="100" type="line"/>
-      <point x="39" y="90" type="line"/>
-      <point x="535" y="90" type="line"/>
-      <point x="535" y="107" type="line"/>
-      <point x="61" y="107" type="line"/>
-      <point x="61" y="102" type="line"/>
-      <point x="395" y="567" type="line"/>
-      <point x="395" y="565" type="line"/>
+      <point x="389" y="-110" type="line"/>
+      <point x="407" y="-110" type="line"/>
+      <point x="407" y="594" type="line"/>
+      <point x="390" y="594" type="line"/>
+      <point x="33" y="100" type="line"/>
+      <point x="33" y="90" type="line"/>
+      <point x="529" y="90" type="line"/>
+      <point x="529" y="107" type="line"/>
+      <point x="55" y="107" type="line"/>
+      <point x="55" y="102" type="line"/>
+      <point x="389" y="567" type="line"/>
+      <point x="389" y="565" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
index cc2f0b6f..5c6592e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ge-cy" format="2">
-  <advance width="420"/>
+  <advance width="424"/>
   <unicode hex="0433"/>
   <anchor x="159" y="0" name="bottomright"/>
   <anchor x="224" y="480" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
index 7697e9d0..768ceb7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gedescender-cy" format="2">
-  <advance width="420"/>
+  <advance width="424"/>
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
index bf24a5f6..4514b6b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="525"/>
+  <advance width="540"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
index 14dd3843..2a3b2f24 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghestroke-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghestroke-cy" format="2">
-  <advance width="418"/>
+  <advance width="441"/>
   <unicode hex="0493"/>
   <outline>
     <contour>
-      <point x="105" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="463" type="line"/>
-      <point x="406" y="463" type="line"/>
-      <point x="406" y="480" type="line"/>
-      <point x="105" y="480" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="145" y="463" type="line"/>
+      <point x="425" y="463" type="line"/>
+      <point x="425" y="480" type="line"/>
+      <point x="124" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="19" y="252" type="line"/>
-      <point x="328" y="252" type="line"/>
-      <point x="328" y="269" type="line"/>
-      <point x="19" y="269" type="line"/>
+      <point x="38" y="252" type="line"/>
+      <point x="347" y="252" type="line"/>
+      <point x="347" y="269" type="line"/>
+      <point x="38" y="269" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
index 2ea4c459..164083ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gheupturn-cy" format="2">
-  <advance width="430"/>
+  <advance width="434"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
index 4ba88de6..1cdb57aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gje-cy" format="2">
-  <advance width="420"/>
+  <advance width="424"/>
   <unicode hex="0453"/>
   <outline>
     <component base="ge-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif 
b/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
index a3cbc730..2f5315e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guillemetleft.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetleft" format="2">
-  <advance width="452"/>
+  <advance width="488"/>
   <unicode hex="00AB"/>
   <outline>
     <contour>
-      <point x="201" y="37" type="line"/>
-      <point x="227" y="37" type="line"/>
-      <point x="67" y="259" type="line"/>
-      <point x="69" y="243" type="line"/>
-      <point x="224" y="456" type="line"/>
-      <point x="202" y="456" type="line"/>
-      <point x="49" y="250" type="line"/>
+      <point x="219" y="37" type="line"/>
+      <point x="245" y="37" type="line"/>
+      <point x="85" y="259" type="line"/>
+      <point x="87" y="243" type="line"/>
+      <point x="242" y="456" type="line"/>
+      <point x="220" y="456" type="line"/>
+      <point x="67" y="250" type="line"/>
     </contour>
     <contour>
-      <point x="378" y="37" type="line"/>
-      <point x="405" y="37" type="line"/>
-      <point x="243" y="259" type="line"/>
-      <point x="245" y="243" type="line"/>
-      <point x="402" y="456" type="line"/>
-      <point x="379" y="456" type="line"/>
-      <point x="226" y="250" type="line"/>
+      <point x="396" y="37" type="line"/>
+      <point x="423" y="37" type="line"/>
+      <point x="261" y="259" type="line"/>
+      <point x="263" y="243" type="line"/>
+      <point x="420" y="456" type="line"/>
+      <point x="397" y="456" type="line"/>
+      <point x="244" y="250" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guillemetright.glif 
b/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
index db659710..2ee6a4a2 100644
--- a/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guillemetright.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guillemetright" format="2">
-  <advance width="452"/>
+  <advance width="488"/>
   <unicode hex="00BB"/>
   <outline>
     <contour>
-      <point x="227" y="36" type="line"/>
-      <point x="250" y="36" type="line"/>
-      <point x="403" y="247" type="line"/>
-      <point x="250" y="455" type="line"/>
-      <point x="223" y="455" type="line"/>
-      <point x="385" y="237" type="line"/>
-      <point x="383" y="253" type="line"/>
+      <point x="245" y="36" type="line"/>
+      <point x="268" y="36" type="line"/>
+      <point x="421" y="247" type="line"/>
+      <point x="268" y="455" type="line"/>
+      <point x="241" y="455" type="line"/>
+      <point x="403" y="237" type="line"/>
+      <point x="401" y="253" type="line"/>
     </contour>
     <contour>
-      <point x="51" y="36" type="line"/>
-      <point x="73" y="36" type="line"/>
-      <point x="226" y="247" type="line"/>
-      <point x="73" y="455" type="line"/>
-      <point x="47" y="455" type="line"/>
-      <point x="208" y="237" type="line"/>
-      <point x="206" y="253" type="line"/>
+      <point x="69" y="36" type="line"/>
+      <point x="91" y="36" type="line"/>
+      <point x="244" y="247" type="line"/>
+      <point x="91" y="455" type="line"/>
+      <point x="65" y="455" type="line"/>
+      <point x="226" y="237" type="line"/>
+      <point x="224" y="253" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif 
b/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
index 71bf1cfb..69f1cf1c 100644
--- a/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guilsinglleft.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglleft" format="2">
-  <advance width="283"/>
+  <advance width="319"/>
   <unicode hex="2039"/>
   <outline>
     <contour>
-      <point x="211" y="32" type="line"/>
-      <point x="237" y="32" type="line"/>
-      <point x="65" y="254" type="line"/>
-      <point x="68" y="238" type="line"/>
-      <point x="234" y="451" type="line"/>
-      <point x="212" y="451" type="line"/>
-      <point x="48" y="245" type="line"/>
+      <point x="229" y="32" type="line"/>
+      <point x="255" y="32" type="line"/>
+      <point x="83" y="254" type="line"/>
+      <point x="86" y="238" type="line"/>
+      <point x="252" y="451" type="line"/>
+      <point x="230" y="451" type="line"/>
+      <point x="66" y="245" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif 
b/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
index 8029ec45..ed515b5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/guilsinglright.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="guilsinglright" format="2">
-  <advance width="283"/>
+  <advance width="319"/>
   <unicode hex="203A"/>
   <outline>
     <contour>
-      <point x="50" y="32" type="line"/>
-      <point x="72" y="32" type="line"/>
-      <point x="235" y="243" type="line"/>
-      <point x="72" y="451" type="line"/>
-      <point x="46" y="451" type="line"/>
-      <point x="218" y="233" type="line"/>
-      <point x="215" y="249" type="line"/>
+      <point x="68" y="32" type="line"/>
+      <point x="90" y="32" type="line"/>
+      <point x="253" y="243" type="line"/>
+      <point x="90" y="451" type="line"/>
+      <point x="64" y="451" type="line"/>
+      <point x="236" y="233" type="line"/>
+      <point x="233" y="249" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
index a13eb269..6ff0f1df 100644
--- a/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
@@ -11,7 +11,7 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>kadescender-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
index 7d8df7c7..a21d9c6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hardsign-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hardsign-cy" format="2">
-  <advance width="534"/>
+  <advance width="553"/>
   <unicode hex="044A"/>
   <outline>
     <contour>
-      <point x="161" y="0" type="line"/>
-      <point x="318" y="0" type="line" smooth="yes"/>
-      <point x="426" y="0"/>
-      <point x="491" y="56"/>
-      <point x="491" y="150" type="curve" smooth="yes"/>
-      <point x="491" y="241"/>
-      <point x="432" y="301"/>
-      <point x="343" y="301" type="curve" smooth="yes"/>
-      <point x="175" y="301" type="line"/>
-      <point x="175" y="284" type="line"/>
-      <point x="335" y="284" type="line" smooth="yes"/>
-      <point x="416" y="284"/>
-      <point x="470" y="228"/>
-      <point x="470" y="145" type="curve" smooth="yes"/>
-      <point x="470" y="65"/>
-      <point x="416" y="17"/>
-      <point x="326" y="17" type="curve" smooth="yes"/>
-      <point x="182" y="17" type="line"/>
-      <point x="182" y="480" type="line"/>
-      <point x="161" y="480" type="line"/>
+      <point x="165" y="0" type="line"/>
+      <point x="322" y="0" type="line" smooth="yes"/>
+      <point x="430" y="0"/>
+      <point x="495" y="56"/>
+      <point x="495" y="150" type="curve" smooth="yes"/>
+      <point x="495" y="241"/>
+      <point x="436" y="301"/>
+      <point x="347" y="301" type="curve" smooth="yes"/>
+      <point x="179" y="301" type="line"/>
+      <point x="179" y="284" type="line"/>
+      <point x="339" y="284" type="line" smooth="yes"/>
+      <point x="420" y="284"/>
+      <point x="474" y="228"/>
+      <point x="474" y="145" type="curve" smooth="yes"/>
+      <point x="474" y="65"/>
+      <point x="420" y="17"/>
+      <point x="330" y="17" type="curve" smooth="yes"/>
+      <point x="186" y="17" type="line"/>
+      <point x="186" y="480" type="line"/>
+      <point x="165" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="12" y="463" type="line"/>
-      <point x="171" y="463" type="line"/>
-      <point x="171" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="175" y="463" type="line"/>
+      <point x="175" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/hyphen.glif b/src/Cantarell-Light.ufo/glyphs/hyphen.glif
index 10797670..2595eb78 100644
--- a/src/Cantarell-Light.ufo/glyphs/hyphen.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hyphen.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hyphen" format="2">
-  <advance width="420"/>
+  <advance width="450"/>
   <unicode hex="002D"/>
   <unicode hex="00AD"/>
   <unicode hex="2010"/>
   <unicode hex="2011"/>
   <outline>
     <contour>
-      <point x="70" y="240" type="line"/>
-      <point x="350" y="240" type="line"/>
-      <point x="350" y="257" type="line"/>
-      <point x="70" y="257" type="line"/>
+      <point x="85" y="240" type="line"/>
+      <point x="365" y="240" type="line"/>
+      <point x="365" y="257" type="line"/>
+      <point x="85" y="257" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
index 416cc031..579112d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ia-cy" format="2">
-  <advance width="496"/>
+  <advance width="515"/>
   <unicode hex="044F"/>
-  <anchor x="238" y="480" name="top"/>
+  <anchor x="257" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="368" y="0" type="line"/>
-      <point x="389" y="0" type="line"/>
-      <point x="389" y="480" type="line"/>
-      <point x="226" y="480" type="line" smooth="yes"/>
-      <point x="116" y="480"/>
-      <point x="49" y="424"/>
-      <point x="49" y="336" type="curve" smooth="yes"/>
-      <point x="49" y="250"/>
-      <point x="116" y="196"/>
-      <point x="221" y="196" type="curve" smooth="yes"/>
-      <point x="377" y="196" type="line"/>
-      <point x="377" y="214" type="line"/>
-      <point x="226" y="214" type="line" smooth="yes"/>
-      <point x="130" y="214"/>
-      <point x="70" y="262"/>
-      <point x="70" y="341" type="curve" smooth="yes"/>
-      <point x="70" y="417"/>
-      <point x="128" y="462"/>
-      <point x="220" y="462" type="curve" smooth="yes"/>
-      <point x="368" y="462" type="line"/>
+      <point x="387" y="0" type="line"/>
+      <point x="408" y="0" type="line"/>
+      <point x="408" y="480" type="line"/>
+      <point x="245" y="480" type="line" smooth="yes"/>
+      <point x="135" y="480"/>
+      <point x="68" y="424"/>
+      <point x="68" y="336" type="curve" smooth="yes"/>
+      <point x="68" y="250"/>
+      <point x="135" y="196"/>
+      <point x="240" y="196" type="curve" smooth="yes"/>
+      <point x="396" y="196" type="line"/>
+      <point x="396" y="214" type="line"/>
+      <point x="245" y="214" type="line" smooth="yes"/>
+      <point x="149" y="214"/>
+      <point x="89" y="262"/>
+      <point x="89" y="341" type="curve" smooth="yes"/>
+      <point x="89" y="417"/>
+      <point x="147" y="462"/>
+      <point x="239" y="462" type="curve" smooth="yes"/>
+      <point x="387" y="462" type="line"/>
     </contour>
     <contour>
-      <point x="45" y="0" type="line"/>
-      <point x="70" y="0" type="line"/>
-      <point x="210" y="209" type="line"/>
-      <point x="188" y="209" type="line"/>
+      <point x="64" y="0" type="line"/>
+      <point x="89" y="0" type="line"/>
+      <point x="229" y="209" type="line"/>
+      <point x="207" y="209" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/increment.glif b/src/Cantarell-Light.ufo/glyphs/increment.glif
index e9d5f0c8..c9799ae5 100644
--- a/src/Cantarell-Light.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Light.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="672"/>
+  <advance width="678"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="81" y="1" type="line"/>
-      <point x="591" y="1" type="line"/>
-      <point x="591" y="14" type="line"/>
-      <point x="342" y="694" type="line"/>
-      <point x="324" y="694" type="line"/>
-      <point x="81" y="14" type="line"/>
+      <point x="84" y="1" type="line"/>
+      <point x="594" y="1" type="line"/>
+      <point x="594" y="14" type="line"/>
+      <point x="345" y="694" type="line"/>
+      <point x="327" y="694" type="line"/>
+      <point x="84" y="14" type="line"/>
     </contour>
     <contour>
-      <point x="105" y="18" type="line"/>
-      <point x="333" y="666" type="line"/>
-      <point x="566" y="18" type="line"/>
+      <point x="108" y="18" type="line"/>
+      <point x="336" y="666" type="line"/>
+      <point x="569" y="18" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/infinity.glif b/src/Cantarell-Light.ufo/glyphs/infinity.glif
index 9fe7a13f..40fcb9fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/infinity.glif
+++ b/src/Cantarell-Light.ufo/glyphs/infinity.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="infinity" format="2">
-  <advance width="941"/>
+  <advance width="971"/>
   <unicode hex="221E"/>
   <outline>
     <contour>
-      <point x="670" y="171" type="curve" smooth="yes"/>
-      <point x="762" y="171"/>
-      <point x="823" y="238"/>
-      <point x="823" y="340" type="curve" smooth="yes"/>
-      <point x="823" y="440"/>
-      <point x="764" y="507"/>
-      <point x="675" y="507" type="curve" smooth="yes"/>
-      <point x="480" y="507"/>
-      <point x="439" y="189"/>
-      <point x="266" y="189" type="curve" smooth="yes"/>
-      <point x="190" y="189"/>
-      <point x="138" y="249"/>
-      <point x="138" y="339" type="curve" smooth="yes"/>
-      <point x="138" y="429"/>
-      <point x="191" y="489"/>
-      <point x="270" y="489" type="curve" smooth="yes"/>
-      <point x="452" y="489"/>
-      <point x="470" y="171"/>
+      <point x="685" y="171" type="curve" smooth="yes"/>
+      <point x="777" y="171"/>
+      <point x="838" y="238"/>
+      <point x="838" y="340" type="curve" smooth="yes"/>
+      <point x="838" y="440"/>
+      <point x="779" y="507"/>
+      <point x="690" y="507" type="curve" smooth="yes"/>
+      <point x="495" y="507"/>
+      <point x="454" y="189"/>
+      <point x="281" y="189" type="curve" smooth="yes"/>
+      <point x="205" y="189"/>
+      <point x="153" y="249"/>
+      <point x="153" y="339" type="curve" smooth="yes"/>
+      <point x="153" y="429"/>
+      <point x="206" y="489"/>
+      <point x="285" y="489" type="curve" smooth="yes"/>
+      <point x="467" y="489"/>
+      <point x="485" y="171"/>
     </contour>
     <contour>
-      <point x="263" y="171" type="curve" smooth="yes"/>
-      <point x="455" y="171"/>
-      <point x="495" y="489"/>
-      <point x="672" y="489" type="curve" smooth="yes"/>
-      <point x="750" y="489"/>
-      <point x="803" y="427"/>
-      <point x="803" y="337" type="curve" smooth="yes"/>
-      <point x="803" y="247"/>
-      <point x="750" y="189"/>
-      <point x="672" y="189" type="curve" smooth="yes"/>
-      <point x="491" y="189"/>
-      <point x="472" y="507"/>
-      <point x="273" y="507" type="curve" smooth="yes"/>
-      <point x="180" y="507"/>
-      <point x="118" y="439"/>
-      <point x="118" y="336" type="curve" smooth="yes"/>
-      <point x="118" y="236"/>
-      <point x="176" y="171"/>
+      <point x="278" y="171" type="curve" smooth="yes"/>
+      <point x="470" y="171"/>
+      <point x="510" y="489"/>
+      <point x="687" y="489" type="curve" smooth="yes"/>
+      <point x="765" y="489"/>
+      <point x="818" y="427"/>
+      <point x="818" y="337" type="curve" smooth="yes"/>
+      <point x="818" y="247"/>
+      <point x="765" y="189"/>
+      <point x="687" y="189" type="curve" smooth="yes"/>
+      <point x="506" y="189"/>
+      <point x="487" y="507"/>
+      <point x="288" y="507" type="curve" smooth="yes"/>
+      <point x="195" y="507"/>
+      <point x="133" y="439"/>
+      <point x="133" y="336" type="curve" smooth="yes"/>
+      <point x="133" y="236"/>
+      <point x="191" y="171"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/integral.glif b/src/Cantarell-Light.ufo/glyphs/integral.glif
index 791647d7..16154d5a 100644
--- a/src/Cantarell-Light.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Light.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="397"/>
+  <advance width="411"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="172" y="-170" type="curve" smooth="yes"/>
-      <point x="236" y="-170"/>
-      <point x="280" y="-108"/>
-      <point x="280" y="-15" type="curve" smooth="yes"/>
-      <point x="280" y="157"/>
-      <point x="129" y="394"/>
-      <point x="129" y="580" type="curve" smooth="yes"/>
-      <point x="129" y="667"/>
-      <point x="162" y="728"/>
-      <point x="227" y="728" type="curve" smooth="yes"/>
-      <point x="247" y="728"/>
-      <point x="287" y="721"/>
-      <point x="307" y="712" type="curve"/>
-      <point x="313" y="729" type="line"/>
-      <point x="296" y="737"/>
-      <point x="258" y="746"/>
-      <point x="230" y="746" type="curve" smooth="yes"/>
-      <point x="151" y="746"/>
-      <point x="110" y="675"/>
-      <point x="110" y="576" type="curve" smooth="yes"/>
-      <point x="110" y="388"/>
-      <point x="260" y="145"/>
-      <point x="260" y="-19" type="curve" smooth="yes"/>
-      <point x="260" y="-99"/>
-      <point x="224" y="-152"/>
-      <point x="172" y="-152" type="curve" smooth="yes"/>
-      <point x="152" y="-152"/>
-      <point x="129" y="-146"/>
-      <point x="96" y="-131" type="curve"/>
-      <point x="90" y="-147" type="line"/>
-      <point x="124" y="-163"/>
-      <point x="150" y="-170"/>
+      <point x="180" y="-170" type="curve" smooth="yes"/>
+      <point x="244" y="-170"/>
+      <point x="288" y="-108"/>
+      <point x="288" y="-15" type="curve" smooth="yes"/>
+      <point x="288" y="157"/>
+      <point x="137" y="394"/>
+      <point x="137" y="580" type="curve" smooth="yes"/>
+      <point x="137" y="667"/>
+      <point x="170" y="728"/>
+      <point x="235" y="728" type="curve" smooth="yes"/>
+      <point x="255" y="728"/>
+      <point x="295" y="721"/>
+      <point x="315" y="712" type="curve"/>
+      <point x="321" y="729" type="line"/>
+      <point x="304" y="737"/>
+      <point x="266" y="746"/>
+      <point x="238" y="746" type="curve" smooth="yes"/>
+      <point x="159" y="746"/>
+      <point x="118" y="675"/>
+      <point x="118" y="576" type="curve" smooth="yes"/>
+      <point x="118" y="388"/>
+      <point x="268" y="145"/>
+      <point x="268" y="-19" type="curve" smooth="yes"/>
+      <point x="268" y="-99"/>
+      <point x="232" y="-152"/>
+      <point x="180" y="-152" type="curve" smooth="yes"/>
+      <point x="160" y="-152"/>
+      <point x="137" y="-146"/>
+      <point x="104" y="-131" type="curve"/>
+      <point x="98" y="-147" type="line"/>
+      <point x="132" y="-163"/>
+      <point x="158" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
index 31d4bed8..fad8e575 100644
--- a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="478"/>
+  <advance width="474"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/k.glif b/src/Cantarell-Light.ufo/glyphs/k.glif
index 6cb997b1..acdf8641 100644
--- a/src/Cantarell-Light.ufo/glyphs/k.glif
+++ b/src/Cantarell-Light.ufo/glyphs/k.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="k" format="2">
-  <advance width="464"/>
+  <advance width="466"/>
   <unicode hex="006B"/>
   <note>
 k
diff --git a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
index 16ac3e1d..9064102c 100644
--- a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ka-cy" format="2">
-  <advance width="460"/>
+  <advance width="479"/>
   <unicode hex="043A"/>
   <anchor x="459" y="0" name="bottomright"/>
   <anchor x="244" y="480" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
index 2fdbebcc..cae88bdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kabashkir-cy" format="2">
-  <advance width="554"/>
+  <advance width="577"/>
   <unicode hex="04A1"/>
   <outline>
     <contour>
-      <point x="201" y="0" type="line"/>
-      <point x="220" y="0" type="line"/>
-      <point x="220" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
-      <point x="12" y="463" type="line"/>
-      <point x="201" y="463" type="line"/>
+      <point x="205" y="0" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="224" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="205" y="463" type="line"/>
     </contour>
     <contour>
-      <point x="514" y="0" type="line"/>
-      <point x="538" y="0" type="line"/>
-      <point x="358" y="260" type="line"/>
-      <point x="358" y="251" type="line"/>
-      <point x="526" y="480" type="line"/>
-      <point x="503" y="480" type="line"/>
-      <point x="339" y="254" type="line"/>
+      <point x="518" y="0" type="line"/>
+      <point x="542" y="0" type="line"/>
+      <point x="362" y="260" type="line"/>
+      <point x="362" y="251" type="line"/>
+      <point x="530" y="480" type="line"/>
+      <point x="507" y="480" type="line"/>
+      <point x="343" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="209" y="245" type="line"/>
-      <point x="352" y="245" type="line"/>
-      <point x="352" y="262" type="line"/>
-      <point x="209" y="262" type="line"/>
+      <point x="213" y="245" type="line"/>
+      <point x="356" y="245" type="line"/>
+      <point x="356" y="262" type="line"/>
+      <point x="213" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kacute.glif b/src/Cantarell-Light.ufo/glyphs/kacute.glif
index 923ea6fd..f3344a9e 100644
--- a/src/Cantarell-Light.ufo/glyphs/kacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kacute" format="2">
-  <advance width="464"/>
+  <advance width="466"/>
   <unicode hex="1E31"/>
   <outline>
     <component base="k"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
index 341e5388..9dc7a2c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="480"/>
+  <advance width="525"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
@@ -10,6 +10,8 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
index 22ef04d8..7d647663 100644
--- a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaverticalstroke-cy" format="2">
-  <advance width="470"/>
+  <advance width="489"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
index 22f4240a..a20b6fde 100644
--- a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kcommaaccent" format="2">
-  <advance width="464"/>
+  <advance width="466"/>
   <unicode hex="0137"/>
   <outline>
     <component base="k"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
index 29360007..01120da5 100644
--- a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="464"/>
+  <advance width="466"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
index 255c81bd..37d0d5e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kje-cy" format="2">
-  <advance width="460"/>
+  <advance width="479"/>
   <unicode hex="045C"/>
   <outline>
     <component base="ka-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.glif b/src/Cantarell-Light.ufo/glyphs/l.glif
index c91bef7c..47f31085 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="006C"/>
   <note>
 l
diff --git a/src/Cantarell-Light.ufo/glyphs/lacute.glif b/src/Cantarell-Light.ufo/glyphs/lacute.glif
index cc1ff482..2673f29c 100644
--- a/src/Cantarell-Light.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
index ed4568fb..35b0d30e 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldot.glif b/src/Cantarell-Light.ufo/glyphs/ldot.glif
index 70a2bbec..5d209c85 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldot.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
index e0e5ff42..2e76530b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
index 85c215b3..7f51f16c 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="687"/>
+  <advance width="694"/>
   <unicode hex="2190"/>
   <note>
 arrowleft
 </note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="687" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="694" yOffset="643"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif 
b/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
index 6194351e..95066521 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftanglebracket-math.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftanglebracket-math" format="2">
-  <advance width="282"/>
+  <advance width="317"/>
   <unicode hex="27E8"/>
   <outline>
     <contour>
-      <point x="214" y="-10" type="line"/>
-      <point x="237" y="-10" type="line"/>
-      <point x="63" y="389" type="line"/>
-      <point x="64" y="374" type="line"/>
-      <point x="230" y="739" type="line"/>
-      <point x="209" y="739" type="line"/>
-      <point x="46" y="380" type="line"/>
+      <point x="232" y="-10" type="line"/>
+      <point x="255" y="-10" type="line"/>
+      <point x="81" y="389" type="line"/>
+      <point x="82" y="374" type="line"/>
+      <point x="248" y="739" type="line"/>
+      <point x="227" y="739" type="line"/>
+      <point x="64" y="380" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
index 9fc169e8..334b2c7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="451"/>
+  <advance width="462"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="283" y="-10" type="curve" smooth="yes"/>
-      <point x="306" y="-10"/>
-      <point x="331" y="-3"/>
-      <point x="353" y="10" type="curve"/>
-      <point x="348" y="24" type="line"/>
-      <point x="328" y="13"/>
-      <point x="305" y="7"/>
-      <point x="286" y="7" type="curve" smooth="yes"/>
-      <point x="234" y="7"/>
-      <point x="200" y="53"/>
-      <point x="200" y="120" type="curve" smooth="yes"/>
-      <point x="200" y="547" type="line" smooth="yes"/>
-      <point x="200" y="657"/>
-      <point x="228" y="731"/>
-      <point x="272" y="731" type="curve" smooth="yes"/>
-      <point x="307" y="731"/>
-      <point x="332" y="684"/>
-      <point x="332" y="616" type="curve" smooth="yes"/>
-      <point x="332" y="522"/>
-      <point x="276" y="405"/>
-      <point x="77" y="138" type="curve"/>
-      <point x="89" y="128" type="line"/>
-      <point x="282" y="385"/>
-      <point x="352" y="512"/>
-      <point x="352" y="618" type="curve" smooth="yes"/>
-      <point x="352" y="695"/>
-      <point x="321" y="749"/>
-      <point x="274" y="749" type="curve" smooth="yes"/>
-      <point x="217" y="749"/>
-      <point x="180" y="667"/>
-      <point x="180" y="544" type="curve" smooth="yes"/>
-      <point x="180" y="117" type="line" smooth="yes"/>
-      <point x="180" y="43"/>
-      <point x="220" y="-10"/>
+      <point x="285" y="-10" type="curve" smooth="yes"/>
+      <point x="308" y="-10"/>
+      <point x="333" y="-3"/>
+      <point x="355" y="10" type="curve"/>
+      <point x="350" y="24" type="line"/>
+      <point x="330" y="13"/>
+      <point x="307" y="7"/>
+      <point x="288" y="7" type="curve" smooth="yes"/>
+      <point x="236" y="7"/>
+      <point x="202" y="53"/>
+      <point x="202" y="120" type="curve" smooth="yes"/>
+      <point x="202" y="547" type="line" smooth="yes"/>
+      <point x="202" y="657"/>
+      <point x="230" y="731"/>
+      <point x="274" y="731" type="curve" smooth="yes"/>
+      <point x="309" y="731"/>
+      <point x="334" y="684"/>
+      <point x="334" y="616" type="curve" smooth="yes"/>
+      <point x="334" y="522"/>
+      <point x="278" y="405"/>
+      <point x="79" y="138" type="curve"/>
+      <point x="91" y="128" type="line"/>
+      <point x="284" y="385"/>
+      <point x="354" y="512"/>
+      <point x="354" y="618" type="curve" smooth="yes"/>
+      <point x="354" y="695"/>
+      <point x="323" y="749"/>
+      <point x="276" y="749" type="curve" smooth="yes"/>
+      <point x="219" y="749"/>
+      <point x="182" y="667"/>
+      <point x="182" y="544" type="curve" smooth="yes"/>
+      <point x="182" y="117" type="line" smooth="yes"/>
+      <point x="182" y="43"/>
+      <point x="222" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lj.glif b/src/Cantarell-Light.ufo/glyphs/lj.glif
index f2ba83fa..46afdbbc 100644
--- a/src/Cantarell-Light.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="499"/>
+  <advance width="504"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="264"/>
+    <component base="j" xOffset="269"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
index d6b811b8..38f79506 100644
--- a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lje-cy" format="2">
-  <advance width="816"/>
+  <advance width="835"/>
   <unicode hex="0459"/>
   <outline>
     <contour>
-      <point x="74" y="-7" type="curve" smooth="yes"/>
-      <point x="140" y="-7"/>
-      <point x="173" y="75"/>
-      <point x="173" y="221" type="curve" smooth="yes"/>
-      <point x="173" y="463" type="line"/>
-      <point x="433" y="463" type="line"/>
-      <point x="433" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="154" y="480" type="line"/>
-      <point x="154" y="212" type="line" smooth="yes"/>
-      <point x="154" y="83"/>
-      <point x="127" y="10"/>
-      <point x="72" y="10" type="curve" smooth="yes"/>
-      <point x="61" y="10"/>
-      <point x="46" y="14"/>
-      <point x="27" y="27" type="curve"/>
-      <point x="20" y="13" type="line"/>
-      <point x="33" y="1"/>
-      <point x="54" y="-7"/>
+      <point x="78" y="-7" type="curve" smooth="yes"/>
+      <point x="144" y="-7"/>
+      <point x="177" y="75"/>
+      <point x="177" y="221" type="curve" smooth="yes"/>
+      <point x="177" y="463" type="line"/>
+      <point x="437" y="463" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="480" type="line"/>
+      <point x="158" y="480" type="line"/>
+      <point x="158" y="212" type="line" smooth="yes"/>
+      <point x="158" y="83"/>
+      <point x="131" y="10"/>
+      <point x="76" y="10" type="curve" smooth="yes"/>
+      <point x="65" y="10"/>
+      <point x="50" y="14"/>
+      <point x="31" y="27" type="curve"/>
+      <point x="24" y="13" type="line"/>
+      <point x="37" y="1"/>
+      <point x="58" y="-7"/>
     </contour>
     <contour>
-      <point x="443" y="0" type="line"/>
-      <point x="595" y="0" type="line" smooth="yes"/>
-      <point x="706" y="0"/>
-      <point x="773" y="56"/>
-      <point x="773" y="150" type="curve" smooth="yes"/>
-      <point x="773" y="241"/>
-      <point x="712" y="301"/>
-      <point x="621" y="301" type="curve" smooth="yes"/>
-      <point x="446" y="301" type="line"/>
-      <point x="446" y="284" type="line"/>
-      <point x="614" y="284" type="line" smooth="yes"/>
-      <point x="695" y="284"/>
-      <point x="751" y="228"/>
-      <point x="751" y="145" type="curve" smooth="yes"/>
-      <point x="751" y="65"/>
-      <point x="696" y="17"/>
-      <point x="604" y="17" type="curve" smooth="yes"/>
-      <point x="443" y="17" type="line"/>
+      <point x="447" y="0" type="line"/>
+      <point x="599" y="0" type="line" smooth="yes"/>
+      <point x="710" y="0"/>
+      <point x="777" y="56"/>
+      <point x="777" y="150" type="curve" smooth="yes"/>
+      <point x="777" y="241"/>
+      <point x="716" y="301"/>
+      <point x="625" y="301" type="curve" smooth="yes"/>
+      <point x="450" y="301" type="line"/>
+      <point x="450" y="284" type="line"/>
+      <point x="618" y="284" type="line" smooth="yes"/>
+      <point x="699" y="284"/>
+      <point x="755" y="228"/>
+      <point x="755" y="145" type="curve" smooth="yes"/>
+      <point x="755" y="65"/>
+      <point x="700" y="17"/>
+      <point x="608" y="17" type="curve" smooth="yes"/>
+      <point x="447" y="17" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
index 25dc51ee..4fc43bc3 100644
--- a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/lslash.glif b/src/Cantarell-Light.ufo/glyphs/lslash.glif
index 55465b17..7a310485 100644
--- a/src/Cantarell-Light.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lslash.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="264"/>
+  <advance width="269"/>
   <unicode hex="0142"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/minute.glif b/src/Cantarell-Light.ufo/glyphs/minute.glif
index 4478b935..8505f46f 100644
--- a/src/Cantarell-Light.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/minute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="308"/>
+  <advance width="340"/>
   <unicode hex="2032"/>
   <note>
 minute
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-64"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.glif b/src/Cantarell-Light.ufo/glyphs/nine.glif
index 606a96cb..12e87baa 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="593"/>
+  <advance width="583"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="593" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="583" yOffset="694"/>
   </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/nine.osf.glif b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
index bf795af1..bfd18cb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine.osf" format="2">
-  <advance width="588"/>
+  <advance width="578"/>
   <outline>
     <contour>
       <point x="229" y="-110" type="curve" smooth="yes"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
index e995bb8f..3c30b037 100644
--- a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="824"/>
+  <advance width="839"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/numbersign.glif b/src/Cantarell-Light.ufo/glyphs/numbersign.glif
index d27ed775..9b0d0820 100644
--- a/src/Cantarell-Light.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/numbersign.glif
@@ -1,31 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numbersign" format="2">
-  <advance width="601"/>
+  <advance width="638"/>
   <unicode hex="0023"/>
   <outline>
     <contour>
-      <point x="407" y="0" type="line"/>
-      <point x="427" y="0" type="line"/>
-      <point x="426" y="694" type="line"/>
-      <point x="406" y="694" type="line"/>
+      <point x="425" y="0" type="line"/>
+      <point x="445" y="0" type="line"/>
+      <point x="444" y="694" type="line"/>
+      <point x="424" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="28" y="215" type="line"/>
-      <point x="574" y="215" type="line"/>
-      <point x="574" y="233" type="line"/>
-      <point x="28" y="233" type="line"/>
+      <point x="46" y="215" type="line"/>
+      <point x="592" y="215" type="line"/>
+      <point x="592" y="233" type="line"/>
+      <point x="46" y="233" type="line"/>
     </contour>
     <contour>
-      <point x="178" y="0" type="line"/>
-      <point x="198" y="0" type="line"/>
-      <point x="197" y="694" type="line"/>
-      <point x="177" y="694" type="line"/>
+      <point x="196" y="0" type="line"/>
+      <point x="216" y="0" type="line"/>
+      <point x="215" y="694" type="line"/>
+      <point x="195" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="28" y="479" type="line"/>
-      <point x="574" y="479" type="line"/>
-      <point x="574" y="497" type="line"/>
-      <point x="28" y="497" type="line"/>
+      <point x="46" y="479" type="line"/>
+      <point x="592" y="479" type="line"/>
+      <point x="592" y="497" type="line"/>
+      <point x="46" y="497" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/numero.glif b/src/Cantarell-Light.ufo/glyphs/numero.glif
index 180641ea..5416a48c 100644
--- a/src/Cantarell-Light.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/numero.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1170"/>
+  <advance width="1276"/>
   <unicode hex="2116"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.glif b/src/Cantarell-Light.ufo/glyphs/one.glif
index e46562ea..705de2fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/one.glif
+++ b/src/Cantarell-Light.ufo/glyphs/one.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one" format="2">
-  <advance width="402"/>
+  <advance width="420"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/one.osf.glif b/src/Cantarell-Light.ufo/glyphs/one.osf.glif
index 8b5761c2..5a97460e 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="402"/>
+  <advance width="420"/>
   <outline>
     <contour>
       <point x="266" y="-2" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif b/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
index ccbb27bb..2f1a17a9 100644
--- a/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ordfeminine.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordfeminine" format="2">
-  <advance width="361"/>
+  <advance width="469"/>
   <unicode hex="00AA"/>
   <outline>
     <contour>
-      <point x="281" y="384" type="line"/>
-      <point x="296" y="384" type="line"/>
-      <point x="296" y="629" type="line" smooth="yes"/>
-      <point x="296" y="705"/>
-      <point x="251" y="749"/>
-      <point x="176" y="749" type="curve" smooth="yes"/>
-      <point x="139" y="749"/>
-      <point x="91" y="737"/>
-      <point x="52" y="717" type="curve"/>
-      <point x="57" y="704" type="line"/>
-      <point x="97" y="724"/>
-      <point x="139" y="733"/>
-      <point x="171" y="733" type="curve" smooth="yes"/>
-      <point x="239" y="733"/>
-      <point x="277" y="696"/>
-      <point x="277" y="626" type="curve" smooth="yes"/>
-      <point x="277" y="436" type="line"/>
+      <point x="332" y="384" type="line"/>
+      <point x="347" y="384" type="line"/>
+      <point x="347" y="629" type="line" smooth="yes"/>
+      <point x="347" y="705"/>
+      <point x="302" y="749"/>
+      <point x="227" y="749" type="curve" smooth="yes"/>
+      <point x="190" y="749"/>
+      <point x="142" y="737"/>
+      <point x="103" y="717" type="curve"/>
+      <point x="108" y="704" type="line"/>
+      <point x="148" y="724"/>
+      <point x="190" y="733"/>
+      <point x="222" y="733" type="curve" smooth="yes"/>
+      <point x="290" y="733"/>
+      <point x="328" y="696"/>
+      <point x="328" y="626" type="curve" smooth="yes"/>
+      <point x="328" y="436" type="line"/>
     </contour>
     <contour>
-      <point x="153" y="377" type="curve" smooth="yes"/>
-      <point x="206" y="377"/>
-      <point x="253" y="400"/>
-      <point x="287" y="441" type="curve"/>
-      <point x="285" y="454" type="line"/>
-      <point x="245" y="412"/>
-      <point x="203" y="393"/>
-      <point x="158" y="393" type="curve" smooth="yes"/>
-      <point x="98" y="393"/>
-      <point x="58" y="426"/>
-      <point x="58" y="476" type="curve" smooth="yes"/>
-      <point x="58" y="540"/>
-      <point x="125" y="568"/>
-      <point x="283" y="568" type="curve"/>
-      <point x="283" y="582" type="line"/>
-      <point x="117" y="582"/>
-      <point x="39" y="548"/>
-      <point x="39" y="473" type="curve" smooth="yes"/>
-      <point x="39" y="415"/>
-      <point x="84" y="377"/>
+      <point x="204" y="377" type="curve" smooth="yes"/>
+      <point x="257" y="377"/>
+      <point x="304" y="400"/>
+      <point x="338" y="441" type="curve"/>
+      <point x="336" y="454" type="line"/>
+      <point x="296" y="412"/>
+      <point x="254" y="393"/>
+      <point x="209" y="393" type="curve" smooth="yes"/>
+      <point x="149" y="393"/>
+      <point x="109" y="426"/>
+      <point x="109" y="476" type="curve" smooth="yes"/>
+      <point x="109" y="540"/>
+      <point x="176" y="568"/>
+      <point x="334" y="568" type="curve"/>
+      <point x="334" y="582" type="line"/>
+      <point x="168" y="582"/>
+      <point x="90" y="548"/>
+      <point x="90" y="473" type="curve" smooth="yes"/>
+      <point x="90" y="415"/>
+      <point x="135" y="377"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif 
b/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
index b741e761..816afc1a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ordmasculine.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ordmasculine" format="2">
-  <advance width="412"/>
+  <advance width="518"/>
   <unicode hex="00BA"/>
   <outline>
     <contour>
-      <point x="206" y="377" type="curve" smooth="yes"/>
-      <point x="300" y="377"/>
-      <point x="365" y="452"/>
-      <point x="365" y="564" type="curve" smooth="yes"/>
-      <point x="365" y="676"/>
-      <point x="301" y="749"/>
-      <point x="208" y="749" type="curve" smooth="yes"/>
-      <point x="111" y="749"/>
-      <point x="47" y="673"/>
-      <point x="47" y="562" type="curve" smooth="yes"/>
-      <point x="47" y="451"/>
-      <point x="110" y="377"/>
+      <point x="259" y="377" type="curve" smooth="yes"/>
+      <point x="353" y="377"/>
+      <point x="418" y="452"/>
+      <point x="418" y="564" type="curve" smooth="yes"/>
+      <point x="418" y="676"/>
+      <point x="354" y="749"/>
+      <point x="261" y="749" type="curve" smooth="yes"/>
+      <point x="164" y="749"/>
+      <point x="100" y="673"/>
+      <point x="100" y="562" type="curve" smooth="yes"/>
+      <point x="100" y="451"/>
+      <point x="163" y="377"/>
     </contour>
     <contour>
-      <point x="208" y="393" type="curve" smooth="yes"/>
-      <point x="121" y="393"/>
-      <point x="66" y="462"/>
-      <point x="66" y="564" type="curve" smooth="yes"/>
-      <point x="66" y="663"/>
-      <point x="119" y="733"/>
-      <point x="204" y="733" type="curve" smooth="yes"/>
-      <point x="289" y="733"/>
-      <point x="346" y="666"/>
-      <point x="346" y="562" type="curve" smooth="yes"/>
-      <point x="346" y="459"/>
-      <point x="291" y="393"/>
+      <point x="261" y="393" type="curve" smooth="yes"/>
+      <point x="174" y="393"/>
+      <point x="119" y="462"/>
+      <point x="119" y="564" type="curve" smooth="yes"/>
+      <point x="119" y="663"/>
+      <point x="172" y="733"/>
+      <point x="257" y="733" type="curve" smooth="yes"/>
+      <point x="342" y="733"/>
+      <point x="399" y="666"/>
+      <point x="399" y="562" type="curve" smooth="yes"/>
+      <point x="399" y="459"/>
+      <point x="344" y="393"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/parenleft.glif b/src/Cantarell-Light.ufo/glyphs/parenleft.glif
index b3298a5a..32030ca3 100644
--- a/src/Cantarell-Light.ufo/glyphs/parenleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/parenleft.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenleft" format="2">
-  <advance width="261"/>
+  <advance width="298"/>
   <unicode hex="0028"/>
   <outline>
     <contour>
-      <point x="203" y="-168" type="curve"/>
-      <point x="219" y="-158" type="line"/>
-      <point x="117" y="10"/>
-      <point x="92" y="100"/>
-      <point x="92" y="293" type="curve" smooth="yes"/>
-      <point x="92" y="473"/>
-      <point x="116" y="557"/>
-      <point x="217" y="734" type="curve"/>
-      <point x="201" y="744" type="line"/>
-      <point x="103" y="576"/>
-      <point x="71" y="465"/>
-      <point x="71" y="288" type="curve" smooth="yes"/>
-      <point x="71" y="102"/>
-      <point x="105" y="-16"/>
+      <point x="224" y="-168" type="curve"/>
+      <point x="240" y="-158" type="line"/>
+      <point x="138" y="10"/>
+      <point x="113" y="100"/>
+      <point x="113" y="293" type="curve" smooth="yes"/>
+      <point x="113" y="473"/>
+      <point x="137" y="557"/>
+      <point x="238" y="734" type="curve"/>
+      <point x="222" y="744" type="line"/>
+      <point x="124" y="576"/>
+      <point x="92" y="465"/>
+      <point x="92" y="288" type="curve" smooth="yes"/>
+      <point x="92" y="102"/>
+      <point x="126" y="-16"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/parenright.glif b/src/Cantarell-Light.ufo/glyphs/parenright.glif
index 0c27a681..5bd8eafa 100644
--- a/src/Cantarell-Light.ufo/glyphs/parenright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/parenright.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="parenright" format="2">
-  <advance width="261"/>
+  <advance width="298"/>
   <unicode hex="0029"/>
   <outline>
-    <component base="parenleft" xScale="-1" xOffset="261"/>
+    <component base="parenleft" xScale="-1" xOffset="298"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
index e523af9e..763f5f88 100644
--- a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="641"/>
+  <advance width="661"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="290" y="-12" type="curve" smooth="yes"/>
-      <point x="437" y="-12"/>
-      <point x="529" y="133"/>
-      <point x="529" y="366" type="curve" smooth="yes"/>
-      <point x="529" y="582"/>
-      <point x="451" y="698"/>
-      <point x="310" y="698" type="curve" smooth="yes"/>
-      <point x="256" y="698"/>
-      <point x="198" y="681"/>
-      <point x="154" y="653" type="curve"/>
-      <point x="159" y="637" type="line"/>
-      <point x="202" y="664"/>
-      <point x="258" y="680"/>
-      <point x="308" y="680" type="curve" smooth="yes"/>
-      <point x="439" y="680"/>
-      <point x="509" y="572"/>
-      <point x="509" y="366" type="curve" smooth="yes"/>
-      <point x="509" y="143"/>
-      <point x="427" y="6"/>
-      <point x="293" y="6" type="curve" smooth="yes"/>
-      <point x="189" y="6"/>
-      <point x="116" y="88"/>
-      <point x="116" y="204" type="curve" smooth="yes"/>
-      <point x="116" y="323"/>
-      <point x="193" y="401"/>
-      <point x="311" y="401" type="curve" smooth="yes"/>
-      <point x="408" y="401"/>
-      <point x="483" y="347"/>
-      <point x="512" y="257" type="curve"/>
-      <point x="515" y="292" type="line"/>
-      <point x="483" y="372"/>
-      <point x="407" y="419"/>
-      <point x="313" y="419" type="curve" smooth="yes"/>
-      <point x="182" y="419"/>
-      <point x="95" y="332"/>
-      <point x="95" y="202" type="curve" smooth="yes"/>
-      <point x="95" y="76"/>
-      <point x="175" y="-12"/>
+      <point x="298" y="-12" type="curve" smooth="yes"/>
+      <point x="445" y="-12"/>
+      <point x="537" y="133"/>
+      <point x="537" y="366" type="curve" smooth="yes"/>
+      <point x="537" y="582"/>
+      <point x="459" y="698"/>
+      <point x="318" y="698" type="curve" smooth="yes"/>
+      <point x="264" y="698"/>
+      <point x="206" y="681"/>
+      <point x="162" y="653" type="curve"/>
+      <point x="167" y="637" type="line"/>
+      <point x="210" y="664"/>
+      <point x="266" y="680"/>
+      <point x="316" y="680" type="curve" smooth="yes"/>
+      <point x="447" y="680"/>
+      <point x="517" y="572"/>
+      <point x="517" y="366" type="curve" smooth="yes"/>
+      <point x="517" y="143"/>
+      <point x="435" y="6"/>
+      <point x="301" y="6" type="curve" smooth="yes"/>
+      <point x="197" y="6"/>
+      <point x="124" y="88"/>
+      <point x="124" y="204" type="curve" smooth="yes"/>
+      <point x="124" y="323"/>
+      <point x="201" y="401"/>
+      <point x="319" y="401" type="curve" smooth="yes"/>
+      <point x="416" y="401"/>
+      <point x="491" y="347"/>
+      <point x="520" y="257" type="curve"/>
+      <point x="523" y="292" type="line"/>
+      <point x="491" y="372"/>
+      <point x="415" y="419"/>
+      <point x="321" y="419" type="curve" smooth="yes"/>
+      <point x="190" y="419"/>
+      <point x="103" y="332"/>
+      <point x="103" y="202" type="curve" smooth="yes"/>
+      <point x="103" y="76"/>
+      <point x="183" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/period.glif b/src/Cantarell-Light.ufo/glyphs/period.glif
index 2eb41b3e..94ccd988 100644
--- a/src/Cantarell-Light.ufo/glyphs/period.glif
+++ b/src/Cantarell-Light.ufo/glyphs/period.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="period" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="002E"/>
   <outline>
     <contour>
-      <point x="98" y="-10" type="curve" smooth="yes"/>
-      <point x="112" y="-10"/>
-      <point x="121" y="0"/>
-      <point x="121" y="13" type="curve" smooth="yes"/>
-      <point x="121" y="27"/>
-      <point x="112" y="37"/>
-      <point x="98" y="37" type="curve" smooth="yes"/>
-      <point x="84" y="37"/>
-      <point x="75" y="27"/>
-      <point x="75" y="13" type="curve" smooth="yes"/>
-      <point x="75" y="0"/>
-      <point x="84" y="-10"/>
+      <point x="115" y="-10" type="curve" smooth="yes"/>
+      <point x="129" y="-10"/>
+      <point x="138" y="0"/>
+      <point x="138" y="13" type="curve" smooth="yes"/>
+      <point x="138" y="27"/>
+      <point x="129" y="37"/>
+      <point x="115" y="37" type="curve" smooth="yes"/>
+      <point x="101" y="37"/>
+      <point x="92" y="27"/>
+      <point x="92" y="13" type="curve" smooth="yes"/>
+      <point x="92" y="0"/>
+      <point x="101" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
index 18e1c246..60923168 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.glif
@@ -3,6 +3,14 @@
   <advance width="230"/>
   <unicode hex="00B7"/>
   <outline>
-    <component base="period" xOffset="1" yOffset="250"/>
+    <component base="period" yOffset="250"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/pi.glif b/src/Cantarell-Light.ufo/glyphs/pi.glif
index 46ecc1b2..000a4af0 100644
--- a/src/Cantarell-Light.ufo/glyphs/pi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/pi.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pi" format="2">
-  <advance width="566"/>
+  <advance width="569"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="472" y="-10" type="curve" smooth="yes"/>
-      <point x="490" y="-10"/>
-      <point x="508" y="-5"/>
-      <point x="523" y="4" type="curve"/>
-      <point x="520" y="17" type="line"/>
-      <point x="506" y="11"/>
-      <point x="488" y="7"/>
-      <point x="474" y="7" type="curve" smooth="yes"/>
-      <point x="450" y="7"/>
-      <point x="434" y="30"/>
-      <point x="434" y="64" type="curve" smooth="yes"/>
-      <point x="434" y="471" type="line"/>
-      <point x="413" y="471" type="line"/>
-      <point x="413" y="64" type="line" smooth="yes"/>
-      <point x="413" y="20"/>
-      <point x="437" y="-10"/>
+      <point x="473" y="-10" type="curve" smooth="yes"/>
+      <point x="491" y="-10"/>
+      <point x="509" y="-5"/>
+      <point x="524" y="4" type="curve"/>
+      <point x="521" y="17" type="line"/>
+      <point x="507" y="11"/>
+      <point x="489" y="7"/>
+      <point x="475" y="7" type="curve" smooth="yes"/>
+      <point x="451" y="7"/>
+      <point x="435" y="30"/>
+      <point x="435" y="64" type="curve" smooth="yes"/>
+      <point x="435" y="471" type="line"/>
+      <point x="414" y="471" type="line"/>
+      <point x="414" y="64" type="line" smooth="yes"/>
+      <point x="414" y="20"/>
+      <point x="438" y="-10"/>
     </contour>
     <contour>
-      <point x="117" y="0" type="line"/>
-      <point x="138" y="0" type="line"/>
-      <point x="138" y="471" type="line"/>
-      <point x="117" y="471" type="line"/>
+      <point x="118" y="0" type="line"/>
+      <point x="139" y="0" type="line"/>
+      <point x="139" y="471" type="line"/>
+      <point x="118" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="37" y="463" type="line"/>
-      <point x="512" y="463" type="line"/>
-      <point x="512" y="480" type="line"/>
-      <point x="37" y="480" type="line"/>
+      <point x="38" y="463" type="line"/>
+      <point x="513" y="463" type="line"/>
+      <point x="513" y="480" type="line"/>
+      <point x="38" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif 
b/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
index 2da2c1d6..1b06b27f 100644
--- a/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
+++ b/src/Cantarell-Light.ufo/glyphs/primeR_eversed.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primeReversed" format="2">
-  <advance width="232"/>
+  <advance width="276"/>
   <unicode hex="2035"/>
   <note>
 uni2035
 </note>
   <outline>
-    <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="322"/>
+    <component base="quotesingle" xScale="-1" yxScale="-0.19201" xOffset="363"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif 
b/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
index 74b579a8..3b0452de 100644
--- a/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
+++ b/src/Cantarell-Light.ufo/glyphs/punctuationspace.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="punctuationspace" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="2008"/>
   <outline>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/question.glif b/src/Cantarell-Light.ufo/glyphs/question.glif
index fa2aae34..a0fdbb60 100644
--- a/src/Cantarell-Light.ufo/glyphs/question.glif
+++ b/src/Cantarell-Light.ufo/glyphs/question.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="question" format="2">
-  <advance width="416"/>
+  <advance width="418"/>
   <unicode hex="003F"/>
   <outline>
     <contour>
-      <point x="183" y="145" type="line"/>
-      <point x="203" y="145" type="line"/>
-      <point x="203" y="218" type="line" smooth="yes"/>
-      <point x="203" y="377"/>
-      <point x="376" y="413"/>
-      <point x="376" y="549" type="curve" smooth="yes"/>
-      <point x="376" y="635"/>
-      <point x="306" y="704"/>
-      <point x="203" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="78" y="681"/>
-      <point x="29" y="644" type="curve"/>
-      <point x="34" y="628" type="line"/>
-      <point x="91" y="665"/>
-      <point x="148" y="685"/>
-      <point x="201" y="685" type="curve" smooth="yes"/>
-      <point x="296" y="685"/>
-      <point x="354" y="621"/>
-      <point x="354" y="547" type="curve" smooth="yes"/>
-      <point x="354" y="419"/>
-      <point x="183" y="386"/>
-      <point x="183" y="218" type="curve" smooth="yes"/>
+      <point x="170" y="145" type="line"/>
+      <point x="190" y="145" type="line"/>
+      <point x="190" y="218" type="line" smooth="yes"/>
+      <point x="190" y="377"/>
+      <point x="363" y="413"/>
+      <point x="363" y="549" type="curve" smooth="yes"/>
+      <point x="363" y="635"/>
+      <point x="293" y="704"/>
+      <point x="190" y="704" type="curve" smooth="yes"/>
+      <point x="131" y="704"/>
+      <point x="65" y="681"/>
+      <point x="16" y="644" type="curve"/>
+      <point x="21" y="628" type="line"/>
+      <point x="78" y="665"/>
+      <point x="135" y="685"/>
+      <point x="188" y="685" type="curve" smooth="yes"/>
+      <point x="283" y="685"/>
+      <point x="341" y="621"/>
+      <point x="341" y="547" type="curve" smooth="yes"/>
+      <point x="341" y="419"/>
+      <point x="170" y="386"/>
+      <point x="170" y="218" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="193" y="-10" type="curve" smooth="yes"/>
-      <point x="207" y="-10"/>
-      <point x="216" y="0"/>
-      <point x="216" y="13" type="curve" smooth="yes"/>
-      <point x="216" y="27"/>
-      <point x="207" y="37"/>
-      <point x="193" y="37" type="curve" smooth="yes"/>
-      <point x="179" y="37"/>
-      <point x="170" y="27"/>
-      <point x="170" y="13" type="curve" smooth="yes"/>
-      <point x="170" y="0"/>
-      <point x="179" y="-10"/>
+      <point x="180" y="-10" type="curve" smooth="yes"/>
+      <point x="194" y="-10"/>
+      <point x="203" y="0"/>
+      <point x="203" y="13" type="curve" smooth="yes"/>
+      <point x="203" y="27"/>
+      <point x="194" y="37"/>
+      <point x="180" y="37" type="curve" smooth="yes"/>
+      <point x="166" y="37"/>
+      <point x="157" y="27"/>
+      <point x="157" y="13" type="curve" smooth="yes"/>
+      <point x="157" y="0"/>
+      <point x="166" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/questiondown.glif 
b/src/Cantarell-Light.ufo/glyphs/questiondown.glif
index 71c5868a..a60a5d62 100644
--- a/src/Cantarell-Light.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Light.ufo/glyphs/questiondown.glif
@@ -1,14 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="questiondown" format="2">
-  <advance width="416"/>
+  <advance width="418"/>
   <unicode hex="00BF"/>
   <outline>
-    <component base="question" xScale="-1" yScale="-1" xOffset="408" yOffset="479"/>
+    <component base="question" xScale="-1" yScale="-1" xOffset="418" yOffset="479"/>
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedbl.glif b/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
index 44ab230f..1beeac39 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedbl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedbl" format="2">
-  <advance width="346"/>
+  <advance width="384"/>
   <unicode hex="0022"/>
   <outline>
     <component base="quotesingle"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
index 864ce68c..2149cc03 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblbase.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblbase" format="2">
-  <advance width="342"/>
+  <advance width="380"/>
   <unicode hex="201E"/>
   <outline>
-    <component base="_typoquote" xOffset="108"/>
-    <component base="_typoquote" xOffset="-38"/>
+    <component base="_typoquote" xOffset="127"/>
+    <component base="_typoquote" xOffset="-19"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
index 840da248..5a97fb1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblleft.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblleft" format="2">
-  <advance width="342"/>
+  <advance width="380"/>
   <unicode hex="201C"/>
   <outline>
     <component base="quoteleft" xOffset="146"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotedblright.glif 
b/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
index 820099a8..7c37817e 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotedblright.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotedblright" format="2">
-  <advance width="342"/>
+  <advance width="380"/>
   <unicode hex="201D"/>
   <outline>
     <component base="quoteright" xOffset="146"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/quoteleft.glif b/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
index 6340cf8d..aad8005d 100644
--- a/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quoteleft.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteleft" format="2">
-  <advance width="196"/>
+  <advance width="234"/>
   <unicode hex="2018"/>
   <outline>
-    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="234" yOffset="591"/>
+    <component base="_typoquote" xScale="-1" yScale="-1" xOffset="253" yOffset="591"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/quoteright.glif b/src/Cantarell-Light.ufo/glyphs/quoteright.glif
index 168dff8d..c1577d13 100644
--- a/src/Cantarell-Light.ufo/glyphs/quoteright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quoteright.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quoteright" format="2">
-  <advance width="196"/>
+  <advance width="234"/>
   <unicode hex="2019"/>
   <outline>
-    <component base="_typoquote" xOffset="-38" yOffset="636"/>
+    <component base="_typoquote" xOffset="-19" yOffset="636"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif 
b/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
index 89c0d4a5..eafed353 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotesinglbase.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesinglbase" format="2">
-  <advance width="196"/>
+  <advance width="234"/>
   <unicode hex="201A"/>
   <outline>
-    <component base="_typoquote" xOffset="-38"/>
+    <component base="_typoquote" xOffset="-19"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/quotesingle.glif b/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
index e4dbf412..273f9f6d 100644
--- a/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
+++ b/src/Cantarell-Light.ufo/glyphs/quotesingle.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="quotesingle" format="2">
-  <advance width="196"/>
+  <advance width="234"/>
   <unicode hex="0027"/>
   <outline>
     <contour>
-      <point x="90" y="432" type="line"/>
-      <point x="106" y="432" type="line"/>
-      <point x="110" y="694" type="line"/>
-      <point x="86" y="694" type="line"/>
+      <point x="109" y="432" type="line"/>
+      <point x="125" y="432" type="line"/>
+      <point x="129" y="694" type="line"/>
+      <point x="105" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ratio.glif b/src/Cantarell-Light.ufo/glyphs/ratio.glif
index fe12f01e..970f12a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ratio.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ratio.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ratio" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="2236"/>
   <outline>
     <component base="colon" yOffset="100"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
index 08c90d96..554b1e6d 100644
--- a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="687"/>
+  <advance width="694"/>
   <unicode hex="2192"/>
   <note>
 arrowright
 </note>
   <outline>
     <contour>
-      <point x="360" y="88" type="line"/>
-      <point x="606" y="330" type="line"/>
-      <point x="606" y="334" type="line"/>
-      <point x="362" y="571" type="line"/>
-      <point x="350" y="557" type="line"/>
-      <point x="572" y="340" type="line"/>
-      <point x="82" y="340" type="line"/>
-      <point x="82" y="323" type="line"/>
-      <point x="572" y="323" type="line"/>
-      <point x="348" y="101" type="line"/>
+      <point x="364" y="88" type="line"/>
+      <point x="610" y="330" type="line"/>
+      <point x="610" y="334" type="line"/>
+      <point x="366" y="571" type="line"/>
+      <point x="354" y="557" type="line"/>
+      <point x="576" y="340" type="line"/>
+      <point x="86" y="340" type="line"/>
+      <point x="86" y="323" type="line"/>
+      <point x="576" y="323" type="line"/>
+      <point x="352" y="101" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif 
b/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
index 91b42de5..1b58781b 100644
--- a/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rightanglebracket-math.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightanglebracket-math" format="2">
-  <advance width="279"/>
+  <advance width="314"/>
   <unicode hex="27E9"/>
   <outline>
     <contour>
-      <point x="45" y="-10" type="line"/>
-      <point x="66" y="-10" type="line"/>
-      <point x="233" y="378" type="line"/>
-      <point x="70" y="739" type="line"/>
-      <point x="46" y="739" type="line"/>
-      <point x="217" y="369" type="line"/>
-      <point x="214" y="384" type="line"/>
+      <point x="62" y="-10" type="line"/>
+      <point x="83" y="-10" type="line"/>
+      <point x="250" y="378" type="line"/>
+      <point x="87" y="739" type="line"/>
+      <point x="63" y="739" type="line"/>
+      <point x="234" y="369" type="line"/>
+      <point x="231" y="384" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/s.glif b/src/Cantarell-Light.ufo/glyphs/s.glif
index d4abff08..8f5e0006 100644
--- a/src/Cantarell-Light.ufo/glyphs/s.glif
+++ b/src/Cantarell-Light.ufo/glyphs/s.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="s" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="0073"/>
   <note>
 s
 </note>
-  <anchor x="220" y="0" name="bottom"/>
-  <anchor x="229" y="480" name="top"/>
+  <anchor x="218" y="0" name="bottom"/>
+  <anchor x="227" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="235" y="-10" type="curve" smooth="yes"/>
-      <point x="338" y="-10"/>
-      <point x="398" y="40"/>
-      <point x="398" y="118" type="curve" smooth="yes"/>
-      <point x="398" y="294"/>
-      <point x="90" y="208"/>
-      <point x="90" y="362" type="curve" smooth="yes"/>
-      <point x="90" y="429"/>
-      <point x="149" y="468"/>
-      <point x="237" y="468" type="curve" smooth="yes"/>
-      <point x="284" y="468"/>
-      <point x="334" y="457"/>
-      <point x="366" y="440" type="curve"/>
-      <point x="373" y="456" type="line"/>
-      <point x="342" y="474"/>
-      <point x="286" y="486"/>
-      <point x="237" y="486" type="curve" smooth="yes"/>
-      <point x="137" y="486"/>
-      <point x="69" y="437"/>
-      <point x="69" y="358" type="curve" smooth="yes"/>
-      <point x="69" y="189"/>
-      <point x="377" y="276"/>
-      <point x="377" y="115" type="curve" smooth="yes"/>
-      <point x="377" y="49"/>
-      <point x="326" y="8"/>
-      <point x="237" y="8" type="curve" smooth="yes"/>
-      <point x="183" y="8"/>
-      <point x="121" y="23"/>
-      <point x="65" y="50" type="curve"/>
-      <point x="58" y="33" type="line"/>
-      <point x="115" y="5"/>
-      <point x="179" y="-10"/>
+      <point x="233" y="-10" type="curve" smooth="yes"/>
+      <point x="336" y="-10"/>
+      <point x="396" y="40"/>
+      <point x="396" y="118" type="curve" smooth="yes"/>
+      <point x="396" y="294"/>
+      <point x="88" y="208"/>
+      <point x="88" y="362" type="curve" smooth="yes"/>
+      <point x="88" y="429"/>
+      <point x="147" y="468"/>
+      <point x="235" y="468" type="curve" smooth="yes"/>
+      <point x="282" y="468"/>
+      <point x="332" y="457"/>
+      <point x="364" y="440" type="curve"/>
+      <point x="371" y="456" type="line"/>
+      <point x="340" y="474"/>
+      <point x="284" y="486"/>
+      <point x="235" y="486" type="curve" smooth="yes"/>
+      <point x="135" y="486"/>
+      <point x="67" y="437"/>
+      <point x="67" y="358" type="curve" smooth="yes"/>
+      <point x="67" y="189"/>
+      <point x="375" y="276"/>
+      <point x="375" y="115" type="curve" smooth="yes"/>
+      <point x="375" y="49"/>
+      <point x="324" y="8"/>
+      <point x="235" y="8" type="curve" smooth="yes"/>
+      <point x="181" y="8"/>
+      <point x="119" y="23"/>
+      <point x="63" y="50" type="curve"/>
+      <point x="56" y="33" type="line"/>
+      <point x="113" y="5"/>
+      <point x="177" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacute.glif b/src/Cantarell-Light.ufo/glyphs/sacute.glif
index d391e394..8ee095ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacute" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="015B"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb" xOffset="162"/>
+    <component base="acutecomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
index 46919651..95554024 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacutedotaccent" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="1E65"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb.loclVIET" xOffset="164"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="76" yOffset="97"/>
+    <component base="acutecomb.loclVIET" xOffset="162"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="74" yOffset="97"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/scaron.glif b/src/Cantarell-Light.ufo/glyphs/scaron.glif
index 02a71ebb..64255051 100644
--- a/src/Cantarell-Light.ufo/glyphs/scaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scaron" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="0161"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb" xOffset="46"/>
+    <component base="caroncomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
index 8a0f0d53..7b2dfbdf 100644
--- a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scarondotaccent" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="1E67"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb.loclVIET" xOffset="44"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="110" yOffset="99"/>
+    <component base="caroncomb.loclVIET" xOffset="42"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="108" yOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scedilla.glif b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
index a917bf82..4124adf9 100644
--- a/src/Cantarell-Light.ufo/glyphs/scedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scedilla" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="015F"/>
   <outline>
     <component base="s"/>
-    <component base="cedillacomb" xOffset="95"/>
+    <component base="cedillacomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
index 4f6b9650..443fc050 100644
--- a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scircumflex" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="015D"/>
   <outline>
     <component base="s"/>
-    <component base="circumflexcomb" xOffset="58"/>
+    <component base="circumflexcomb" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
index ade75d7d..03a32a65 100644
--- a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scommaaccent" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="0219"/>
   <outline>
     <component base="s"/>
-    <component base="commaaccentcomb" xOffset="91"/>
+    <component base="commaaccentcomb" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
index f9f1aaf3..14a6f447 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotaccent" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="1E61"/>
   <outline>
     <component base="s"/>
-    <component base="dotaccentcomb" xOffset="110"/>
+    <component base="dotaccentcomb" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
index 3004ba18..53d5d8d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelow" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="1E63"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xOffset="100"/>
+    <component base="dotbelowcomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
index 183b2434..2f419d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelowdotaccent" format="2">
-  <advance width="455"/>
+  <advance width="451"/>
   <unicode hex="1E69"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="105"/>
-    <component base="dotaccentcomb" xOffset="110"/>
+    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="103"/>
+    <component base="dotaccentcomb" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/second.glif b/src/Cantarell-Light.ufo/glyphs/second.glif
index d61994c0..01ea9170 100644
--- a/src/Cantarell-Light.ufo/glyphs/second.glif
+++ b/src/Cantarell-Light.ufo/glyphs/second.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="488"/>
+  <advance width="520"/>
   <unicode hex="2033"/>
   <note>
 second
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-64"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="116"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-55"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="125"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/section.glif b/src/Cantarell-Light.ufo/glyphs/section.glif
index ed2817d8..5bf3822c 100644
--- a/src/Cantarell-Light.ufo/glyphs/section.glif
+++ b/src/Cantarell-Light.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="558"/>
+  <advance width="581"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="288" y="-60" type="curve" smooth="yes"/>
-      <point x="387" y="-60"/>
-      <point x="453" y="-12"/>
-      <point x="453" y="71" type="curve" smooth="yes"/>
-      <point x="453" y="257"/>
-      <point x="131" y="174"/>
-      <point x="131" y="333" type="curve" smooth="yes"/>
-      <point x="131" y="399"/>
-      <point x="188" y="444"/>
-      <point x="284" y="444" type="curve"/>
-      <point x="285" y="457" type="line"/>
-      <point x="176" y="457"/>
-      <point x="110" y="408"/>
-      <point x="110" y="330" type="curve" smooth="yes"/>
-      <point x="110" y="156"/>
-      <point x="432" y="238"/>
-      <point x="432" y="68" type="curve" smooth="yes"/>
-      <point x="432" y="-2"/>
-      <point x="376" y="-42"/>
-      <point x="290" y="-42" type="curve" smooth="yes"/>
-      <point x="231" y="-42"/>
-      <point x="168" y="-24"/>
-      <point x="112" y="4" type="curve"/>
-      <point x="105" y="-13" type="line"/>
-      <point x="159" y="-42"/>
-      <point x="228" y="-60"/>
+      <point x="300" y="-60" type="curve" smooth="yes"/>
+      <point x="399" y="-60"/>
+      <point x="465" y="-12"/>
+      <point x="465" y="71" type="curve" smooth="yes"/>
+      <point x="465" y="257"/>
+      <point x="143" y="174"/>
+      <point x="143" y="333" type="curve" smooth="yes"/>
+      <point x="143" y="399"/>
+      <point x="200" y="444"/>
+      <point x="296" y="444" type="curve"/>
+      <point x="297" y="457" type="line"/>
+      <point x="188" y="457"/>
+      <point x="122" y="408"/>
+      <point x="122" y="330" type="curve" smooth="yes"/>
+      <point x="122" y="156"/>
+      <point x="444" y="238"/>
+      <point x="444" y="68" type="curve" smooth="yes"/>
+      <point x="444" y="-2"/>
+      <point x="388" y="-42"/>
+      <point x="302" y="-42" type="curve" smooth="yes"/>
+      <point x="243" y="-42"/>
+      <point x="180" y="-24"/>
+      <point x="124" y="4" type="curve"/>
+      <point x="117" y="-13" type="line"/>
+      <point x="171" y="-42"/>
+      <point x="240" y="-60"/>
     </contour>
     <contour>
-      <point x="289" y="193" type="line"/>
-      <point x="387" y="193"/>
-      <point x="446" y="239"/>
-      <point x="446" y="316" type="curve" smooth="yes"/>
-      <point x="446" y="497"/>
-      <point x="133" y="421"/>
-      <point x="133" y="568" type="curve" smooth="yes"/>
-      <point x="133" y="634"/>
-      <point x="195" y="686"/>
-      <point x="286" y="686" type="curve" smooth="yes"/>
-      <point x="332" y="686"/>
-      <point x="384" y="673"/>
-      <point x="425" y="652" type="curve"/>
-      <point x="432" y="668" type="line"/>
-      <point x="389" y="691"/>
-      <point x="338" y="704"/>
-      <point x="289" y="704" type="curve" smooth="yes"/>
-      <point x="185" y="704"/>
-      <point x="112" y="646"/>
-      <point x="112" y="566" type="curve" smooth="yes"/>
-      <point x="112" y="402"/>
-      <point x="425" y="481"/>
-      <point x="425" y="315" type="curve" smooth="yes"/>
-      <point x="425" y="248"/>
-      <point x="375" y="206"/>
-      <point x="290" y="206" type="curve"/>
+      <point x="301" y="193" type="line"/>
+      <point x="399" y="193"/>
+      <point x="458" y="239"/>
+      <point x="458" y="316" type="curve" smooth="yes"/>
+      <point x="458" y="497"/>
+      <point x="145" y="421"/>
+      <point x="145" y="568" type="curve" smooth="yes"/>
+      <point x="145" y="634"/>
+      <point x="207" y="686"/>
+      <point x="298" y="686" type="curve" smooth="yes"/>
+      <point x="344" y="686"/>
+      <point x="396" y="673"/>
+      <point x="437" y="652" type="curve"/>
+      <point x="444" y="668" type="line"/>
+      <point x="401" y="691"/>
+      <point x="350" y="704"/>
+      <point x="301" y="704" type="curve" smooth="yes"/>
+      <point x="197" y="704"/>
+      <point x="124" y="646"/>
+      <point x="124" y="566" type="curve" smooth="yes"/>
+      <point x="124" y="402"/>
+      <point x="437" y="481"/>
+      <point x="437" y="315" type="curve" smooth="yes"/>
+      <point x="437" y="248"/>
+      <point x="387" y="206"/>
+      <point x="302" y="206" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/semicolon.glif b/src/Cantarell-Light.ufo/glyphs/semicolon.glif
index 7d024103..1e7bff44 100644
--- a/src/Cantarell-Light.ufo/glyphs/semicolon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/semicolon.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="semicolon" format="2">
-  <advance width="196"/>
+  <advance width="230"/>
   <unicode hex="003B"/>
   <outline>
     <component base="comma"/>
-    <component base="period" yOffset="440"/>
+    <component base="period" xOffset="8" yOffset="440"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.glif b/src/Cantarell-Light.ufo/glyphs/seven.glif
index 81a666d2..881cbc0e 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven" format="2">
-  <advance width="525"/>
+  <advance width="482"/>
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="159" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="473" y="682" type="line"/>
-      <point x="473" y="694" type="line"/>
-      <point x="46" y="694" type="line"/>
-      <point x="46" y="676" type="line"/>
-      <point x="456" y="676" type="line"/>
-      <point x="453" y="685" type="line"/>
+      <point x="135" y="0" type="line"/>
+      <point x="158" y="0" type="line"/>
+      <point x="449" y="682" type="line"/>
+      <point x="449" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
+      <point x="22" y="676" type="line"/>
+      <point x="432" y="676" type="line"/>
+      <point x="429" y="685" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
index c32b6f6e..8bccd3ff 100644
--- a/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/seven.osf.glif
@@ -1,16 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven.osf" format="2">
-  <advance width="525"/>
+  <advance width="482"/>
   <outline>
     <contour>
-      <point x="159" y="-100" type="line"/>
-      <point x="182" y="-100" type="line"/>
-      <point x="473" y="582" type="line"/>
-      <point x="473" y="594" type="line"/>
-      <point x="46" y="594" type="line"/>
-      <point x="46" y="576" type="line"/>
-      <point x="456" y="576" type="line"/>
-      <point x="453" y="585" type="line"/>
+      <point x="135" y="-100" type="line"/>
+      <point x="158" y="-100" type="line"/>
+      <point x="449" y="582" type="line"/>
+      <point x="449" y="594" type="line"/>
+      <point x="22" y="594" type="line"/>
+      <point x="22" y="576" type="line"/>
+      <point x="432" y="576" type="line"/>
+      <point x="429" y="585" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
index 9c3dd6ed..e14de5aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="768"/>
+  <advance width="782"/>
   <unicode hex="0449"/>
   <outline>
     <component base="sha-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.glif b/src/Cantarell-Light.ufo/glyphs/six.glif
index 6ea317b9..5769311c 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six" format="2">
-  <advance width="593"/>
+  <advance width="583"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="315" y="-10" type="curve" smooth="yes"/>
-      <point x="435" y="-10"/>
-      <point x="520" y="77"/>
-      <point x="520" y="206" type="curve" smooth="yes"/>
-      <point x="520" y="333"/>
-      <point x="437" y="412"/>
-      <point x="318" y="412" type="curve" smooth="yes"/>
-      <point x="216" y="412"/>
-      <point x="142" y="357"/>
-      <point x="101" y="250" type="curve"/>
-      <point x="101" y="219" type="line"/>
-      <point x="142" y="336"/>
-      <point x="214" y="394"/>
-      <point x="314" y="394" type="curve" smooth="yes"/>
-      <point x="421" y="394"/>
-      <point x="499" y="322"/>
-      <point x="499" y="203" type="curve" smooth="yes"/>
-      <point x="499" y="86"/>
-      <point x="424" y="8"/>
-      <point x="316" y="8" type="curve" smooth="yes"/>
-      <point x="183" y="8"/>
-      <point x="106" y="125"/>
-      <point x="106" y="322" type="curve" smooth="yes"/>
-      <point x="106" y="559"/>
-      <point x="194" y="686"/>
-      <point x="359" y="686" type="curve" smooth="yes"/>
-      <point x="410" y="686"/>
-      <point x="455" y="674"/>
-      <point x="496" y="650" type="curve"/>
-      <point x="503" y="667" type="line"/>
-      <point x="455" y="693"/>
-      <point x="412" y="704"/>
-      <point x="361" y="704" type="curve" smooth="yes"/>
-      <point x="181" y="704"/>
-      <point x="85" y="569"/>
-      <point x="85" y="319" type="curve" smooth="yes"/>
-      <point x="85" y="113"/>
-      <point x="170" y="-10"/>
+      <point x="305" y="-10" type="curve" smooth="yes"/>
+      <point x="425" y="-10"/>
+      <point x="510" y="77"/>
+      <point x="510" y="206" type="curve" smooth="yes"/>
+      <point x="510" y="333"/>
+      <point x="427" y="412"/>
+      <point x="308" y="412" type="curve" smooth="yes"/>
+      <point x="206" y="412"/>
+      <point x="132" y="357"/>
+      <point x="91" y="250" type="curve"/>
+      <point x="91" y="219" type="line"/>
+      <point x="132" y="336"/>
+      <point x="204" y="394"/>
+      <point x="304" y="394" type="curve" smooth="yes"/>
+      <point x="411" y="394"/>
+      <point x="489" y="322"/>
+      <point x="489" y="203" type="curve" smooth="yes"/>
+      <point x="489" y="86"/>
+      <point x="414" y="8"/>
+      <point x="306" y="8" type="curve" smooth="yes"/>
+      <point x="173" y="8"/>
+      <point x="96" y="125"/>
+      <point x="96" y="322" type="curve" smooth="yes"/>
+      <point x="96" y="559"/>
+      <point x="184" y="686"/>
+      <point x="349" y="686" type="curve" smooth="yes"/>
+      <point x="400" y="686"/>
+      <point x="445" y="674"/>
+      <point x="486" y="650" type="curve"/>
+      <point x="493" y="667" type="line"/>
+      <point x="445" y="693"/>
+      <point x="402" y="704"/>
+      <point x="351" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="75" y="569"/>
+      <point x="75" y="319" type="curve" smooth="yes"/>
+      <point x="75" y="113"/>
+      <point x="160" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/six.osf.glif b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
index 24088a4f..4d4b7fc8 100644
--- a/src/Cantarell-Light.ufo/glyphs/six.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/six.osf.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six.osf" format="2">
-  <advance width="588"/>
+  <advance width="578"/>
   <outline>
     <contour>
-      <point x="313" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="515" y="77"/>
-      <point x="515" y="206" type="curve" smooth="yes"/>
-      <point x="515" y="333"/>
-      <point x="435" y="410"/>
-      <point x="316" y="410" type="curve" smooth="yes"/>
-      <point x="219" y="410"/>
-      <point x="143" y="361"/>
-      <point x="97" y="270" type="curve"/>
-      <point x="97" y="239" type="line"/>
-      <point x="141" y="337"/>
-      <point x="218" y="392"/>
-      <point x="314" y="392" type="curve" smooth="yes"/>
-      <point x="420" y="392"/>
-      <point x="494" y="322"/>
-      <point x="494" y="203" type="curve" smooth="yes"/>
-      <point x="494" y="86"/>
-      <point x="422" y="8"/>
-      <point x="314" y="8" type="curve" smooth="yes"/>
-      <point x="182" y="8"/>
-      <point x="106" y="125"/>
-      <point x="106" y="322" type="curve" smooth="yes"/>
-      <point x="106" y="560"/>
-      <point x="193" y="686"/>
-      <point x="357" y="686" type="curve" smooth="yes"/>
-      <point x="408" y="686"/>
-      <point x="458" y="673"/>
-      <point x="496" y="650" type="curve"/>
-      <point x="503" y="667" type="line"/>
-      <point x="462" y="691"/>
-      <point x="413" y="704"/>
-      <point x="359" y="704" type="curve" smooth="yes"/>
-      <point x="180" y="704"/>
-      <point x="85" y="570"/>
-      <point x="85" y="319" type="curve" smooth="yes"/>
-      <point x="85" y="113"/>
-      <point x="169" y="-10"/>
+      <point x="303" y="-10" type="curve" smooth="yes"/>
+      <point x="423" y="-10"/>
+      <point x="505" y="77"/>
+      <point x="505" y="206" type="curve" smooth="yes"/>
+      <point x="505" y="333"/>
+      <point x="425" y="410"/>
+      <point x="306" y="410" type="curve" smooth="yes"/>
+      <point x="209" y="410"/>
+      <point x="133" y="361"/>
+      <point x="87" y="270" type="curve"/>
+      <point x="87" y="239" type="line"/>
+      <point x="131" y="337"/>
+      <point x="208" y="392"/>
+      <point x="304" y="392" type="curve" smooth="yes"/>
+      <point x="410" y="392"/>
+      <point x="484" y="322"/>
+      <point x="484" y="203" type="curve" smooth="yes"/>
+      <point x="484" y="86"/>
+      <point x="412" y="8"/>
+      <point x="304" y="8" type="curve" smooth="yes"/>
+      <point x="172" y="8"/>
+      <point x="96" y="125"/>
+      <point x="96" y="322" type="curve" smooth="yes"/>
+      <point x="96" y="560"/>
+      <point x="183" y="686"/>
+      <point x="347" y="686" type="curve" smooth="yes"/>
+      <point x="398" y="686"/>
+      <point x="448" y="673"/>
+      <point x="486" y="650" type="curve"/>
+      <point x="493" y="667" type="line"/>
+      <point x="452" y="691"/>
+      <point x="403" y="704"/>
+      <point x="349" y="704" type="curve" smooth="yes"/>
+      <point x="170" y="704"/>
+      <point x="75" y="570"/>
+      <point x="75" y="319" type="curve" smooth="yes"/>
+      <point x="75" y="113"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/slash.glif b/src/Cantarell-Light.ufo/glyphs/slash.glif
index 101adae9..ed812a9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/slash.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="slash" format="2">
-  <advance width="293"/>
+  <advance width="303"/>
   <unicode hex="002F"/>
   <outline>
     <contour>
-      <point x="34" y="-115" type="line"/>
-      <point x="54" y="-115" type="line"/>
-      <point x="259" y="739" type="line"/>
-      <point x="237" y="739" type="line"/>
+      <point x="39" y="-115" type="line"/>
+      <point x="59" y="-115" type="line"/>
+      <point x="264" y="739" type="line"/>
+      <point x="242" y="739" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
index cb292cd3..5a223bca 100644
--- a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="softsign-cy" format="2">
-  <advance width="488"/>
+  <advance width="503"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/summation.glif b/src/Cantarell-Light.ufo/glyphs/summation.glif
index 6765d43d..61b116f1 100644
--- a/src/Cantarell-Light.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Light.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="642"/>
+  <advance width="645"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="79" y="-95" type="line"/>
-      <point x="564" y="-95" type="line"/>
-      <point x="564" y="-78" type="line"/>
-      <point x="103" y="-78" type="line"/>
-      <point x="428" y="299" type="line"/>
-      <point x="106" y="675" type="line"/>
-      <point x="564" y="677" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="79" y="694" type="line"/>
-      <point x="79" y="680" type="line"/>
-      <point x="404" y="299" type="line"/>
-      <point x="79" y="-81" type="line"/>
+      <point x="81" y="-95" type="line"/>
+      <point x="566" y="-95" type="line"/>
+      <point x="566" y="-78" type="line"/>
+      <point x="105" y="-78" type="line"/>
+      <point x="430" y="299" type="line"/>
+      <point x="108" y="675" type="line"/>
+      <point x="566" y="677" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="81" y="694" type="line"/>
+      <point x="81" y="680" type="line"/>
+      <point x="406" y="299" type="line"/>
+      <point x="81" y="-81" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/te-cy.glif b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
index 015aff41..05a38b70 100644
--- a/src/Cantarell-Light.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="te-cy" format="2">
-  <advance width="435"/>
+  <advance width="443"/>
   <unicode hex="0442"/>
-  <anchor x="423" y="0" name="bottomright"/>
+  <anchor x="427" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="207" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="463" type="line"/>
-      <point x="423" y="463" type="line"/>
-      <point x="423" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
-      <point x="12" y="463" type="line"/>
-      <point x="207" y="463" type="line"/>
+      <point x="211" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="463" type="line"/>
+      <point x="427" y="463" type="line"/>
+      <point x="427" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="211" y="463" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/tripleprime.glif b/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
index 54c0ae95..67e5e4f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tripleprime.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tripleprime" format="2">
-  <advance width="552"/>
+  <advance width="596"/>
   <unicode hex="2034"/>
   <note>
 uni2034
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-90"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="70"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="230"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-87"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="73"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
index 0411d9d2..60825ae2 100644
--- a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="531"/>
+  <advance width="545"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
index 15136b32..bf7f34e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
@@ -2,7 +2,7 @@
 <glyph name="tshe-cy" format="2">
   <advance width="563"/>
   <unicode hex="045B"/>
-  <anchor x="436" y="0" name="bottom"/>
+  <anchor x="455" y="0" name="bottom"/>
   <outline>
     <component base="hbar"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
index ae74668e..e18ebbdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="640"/>
+  <advance width="646"/>
   <unicode hex="2191"/>
   <note>
 arrowup
 </note>
   <outline>
     <contour>
-      <point x="311" y="44" type="line"/>
-      <point x="330" y="44" type="line"/>
-      <point x="330" y="561" type="line"/>
-      <point x="547" y="326" type="line"/>
-      <point x="561" y="339" type="line"/>
+      <point x="314" y="44" type="line"/>
+      <point x="333" y="44" type="line"/>
+      <point x="333" y="561" type="line"/>
+      <point x="550" y="326" type="line"/>
+      <point x="564" y="339" type="line"/>
+      <point x="325" y="598" type="line"/>
       <point x="322" y="598" type="line"/>
-      <point x="319" y="598" type="line"/>
-      <point x="79" y="337" type="line"/>
-      <point x="92" y="324" type="line"/>
-      <point x="311" y="562" type="line"/>
+      <point x="82" y="337" type="line"/>
+      <point x="95" y="324" type="line"/>
+      <point x="314" y="562" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
index f739dd04..fe9ab3c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ve-cy" format="2">
-  <advance width="509"/>
+  <advance width="527"/>
   <unicode hex="0432"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/yat-cy.glif b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
index 657f33ca..1d4e7996 100644
--- a/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yat-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yat-cy" format="2">
-  <advance width="473"/>
+  <advance width="507"/>
   <unicode hex="0463"/>
   <outline>
     <contour>
-      <point x="93" y="0" type="line"/>
-      <point x="252" y="0" type="line" smooth="yes"/>
-      <point x="363" y="0"/>
-      <point x="430" y="56"/>
-      <point x="430" y="150" type="curve" smooth="yes"/>
-      <point x="430" y="241"/>
-      <point x="369" y="301"/>
-      <point x="278" y="301" type="curve" smooth="yes"/>
-      <point x="105" y="301" type="line"/>
-      <point x="105" y="284" type="line"/>
-      <point x="271" y="284" type="line" smooth="yes"/>
-      <point x="352" y="284"/>
-      <point x="408" y="228"/>
-      <point x="408" y="145" type="curve" smooth="yes"/>
-      <point x="408" y="65"/>
-      <point x="353" y="17"/>
-      <point x="261" y="17" type="curve" smooth="yes"/>
-      <point x="113" y="17" type="line"/>
-      <point x="113" y="739" type="line"/>
-      <point x="93" y="739" type="line"/>
+      <point x="112" y="0" type="line"/>
+      <point x="271" y="0" type="line" smooth="yes"/>
+      <point x="382" y="0"/>
+      <point x="449" y="56"/>
+      <point x="449" y="150" type="curve" smooth="yes"/>
+      <point x="449" y="241"/>
+      <point x="388" y="301"/>
+      <point x="297" y="301" type="curve" smooth="yes"/>
+      <point x="124" y="301" type="line"/>
+      <point x="124" y="284" type="line"/>
+      <point x="290" y="284" type="line" smooth="yes"/>
+      <point x="371" y="284"/>
+      <point x="427" y="228"/>
+      <point x="427" y="145" type="curve" smooth="yes"/>
+      <point x="427" y="65"/>
+      <point x="372" y="17"/>
+      <point x="280" y="17" type="curve" smooth="yes"/>
+      <point x="132" y="17" type="line"/>
+      <point x="132" y="739" type="line"/>
+      <point x="112" y="739" type="line"/>
     </contour>
     <contour>
-      <point x="23" y="479" type="line"/>
-      <point x="260" y="479" type="line"/>
-      <point x="260" y="496" type="line"/>
-      <point x="23" y="496" type="line"/>
+      <point x="42" y="479" type="line"/>
+      <point x="279" y="479" type="line"/>
+      <point x="279" y="496" type="line"/>
+      <point x="42" y="496" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
index b80c21bc..e35313eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yusbig-cy" format="2">
-  <advance width="584"/>
+  <advance width="614"/>
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="40" y="0" type="curve"/>
-      <point x="59" y="0" type="line"/>
-      <point x="59" y="174"/>
-      <point x="131" y="254"/>
-      <point x="289" y="254" type="curve" smooth="yes"/>
-      <point x="451" y="254"/>
-      <point x="525" y="174"/>
-      <point x="525" y="0" type="curve"/>
-      <point x="544" y="0" type="line"/>
-      <point x="544" y="187"/>
-      <point x="465" y="272"/>
-      <point x="294" y="272" type="curve" smooth="yes"/>
-      <point x="120" y="272"/>
-      <point x="40" y="187"/>
+      <point x="55" y="0" type="curve"/>
+      <point x="74" y="0" type="line"/>
+      <point x="74" y="174"/>
+      <point x="146" y="254"/>
+      <point x="304" y="254" type="curve" smooth="yes"/>
+      <point x="466" y="254"/>
+      <point x="540" y="174"/>
+      <point x="540" y="0" type="curve"/>
+      <point x="559" y="0" type="line"/>
+      <point x="559" y="187"/>
+      <point x="480" y="272"/>
+      <point x="309" y="272" type="curve" smooth="yes"/>
+      <point x="135" y="272"/>
+      <point x="55" y="187"/>
     </contour>
     <contour>
-      <point x="281" y="0" type="line"/>
-      <point x="301" y="0" type="line"/>
-      <point x="301" y="259" type="line"/>
-      <point x="281" y="259" type="line"/>
+      <point x="296" y="0" type="line"/>
+      <point x="316" y="0" type="line"/>
+      <point x="316" y="259" type="line"/>
+      <point x="296" y="259" type="line"/>
     </contour>
     <contour>
-      <point x="270" y="269" type="line"/>
-      <point x="292" y="269" type="line"/>
-      <point x="96" y="469" type="line"/>
-      <point x="94" y="464" type="line"/>
-      <point x="489" y="464" type="line"/>
-      <point x="487" y="469" type="line"/>
-      <point x="289" y="270" type="line"/>
-      <point x="310" y="270" type="line"/>
-      <point x="506" y="462" type="line"/>
-      <point x="506" y="480" type="line"/>
-      <point x="77" y="480" type="line"/>
-      <point x="77" y="462" type="line"/>
+      <point x="285" y="269" type="line"/>
+      <point x="307" y="269" type="line"/>
+      <point x="111" y="469" type="line"/>
+      <point x="109" y="464" type="line"/>
+      <point x="504" y="464" type="line"/>
+      <point x="502" y="469" type="line"/>
+      <point x="304" y="270" type="line"/>
+      <point x="325" y="270" type="line"/>
+      <point x="521" y="462" type="line"/>
+      <point x="521" y="480" type="line"/>
+      <point x="92" y="480" type="line"/>
+      <point x="92" y="462" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ze-cy.glif b/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
index 9ddbb63e..afc6e770 100644
--- a/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ze-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ze-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="0437"/>
-  <anchor x="223" y="0" name="bottom"/>
-  <anchor x="223" y="480" name="top"/>
+  <anchor x="237" y="0" name="bottom"/>
+  <anchor x="237" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="205" y="-7" type="curve" smooth="yes"/>
-      <point x="315" y="-7"/>
-      <point x="387" y="43"/>
-      <point x="387" y="127" type="curve" smooth="yes"/>
-      <point x="387" y="205"/>
-      <point x="324" y="256"/>
-      <point x="233" y="257" type="curve"/>
-      <point x="242" y="253" type="line"/>
-      <point x="326" y="253"/>
-      <point x="375" y="296"/>
-      <point x="375" y="366" type="curve" smooth="yes"/>
-      <point x="375" y="443"/>
-      <point x="310" y="490"/>
-      <point x="204" y="490" type="curve" smooth="yes"/>
-      <point x="145" y="490"/>
-      <point x="91" y="476"/>
-      <point x="47" y="449" type="curve"/>
-      <point x="52" y="433" type="line"/>
-      <point x="100" y="459"/>
-      <point x="148" y="472"/>
-      <point x="199" y="472" type="curve" smooth="yes"/>
-      <point x="295" y="472"/>
-      <point x="355" y="429"/>
-      <point x="355" y="361" type="curve" smooth="yes"/>
-      <point x="355" y="299"/>
-      <point x="303" y="261"/>
-      <point x="218" y="261" type="curve" smooth="yes"/>
-      <point x="129" y="261" type="line"/>
-      <point x="129" y="244" type="line"/>
-      <point x="210" y="244" type="line" smooth="yes"/>
-      <point x="304" y="244"/>
-      <point x="367" y="198"/>
-      <point x="367" y="124" type="curve" smooth="yes"/>
-      <point x="367" y="53"/>
-      <point x="305" y="12"/>
-      <point x="206" y="12" type="curve" smooth="yes"/>
-      <point x="148" y="12"/>
-      <point x="84" y="26"/>
-      <point x="37" y="49" type="curve"/>
-      <point x="32" y="31" type="line"/>
-      <point x="81" y="8"/>
-      <point x="140" y="-7"/>
+      <point x="219" y="-7" type="curve" smooth="yes"/>
+      <point x="329" y="-7"/>
+      <point x="401" y="43"/>
+      <point x="401" y="127" type="curve" smooth="yes"/>
+      <point x="401" y="205"/>
+      <point x="338" y="256"/>
+      <point x="247" y="257" type="curve"/>
+      <point x="256" y="253" type="line"/>
+      <point x="340" y="253"/>
+      <point x="389" y="296"/>
+      <point x="389" y="366" type="curve" smooth="yes"/>
+      <point x="389" y="443"/>
+      <point x="324" y="490"/>
+      <point x="218" y="490" type="curve" smooth="yes"/>
+      <point x="159" y="490"/>
+      <point x="105" y="476"/>
+      <point x="61" y="449" type="curve"/>
+      <point x="66" y="433" type="line"/>
+      <point x="114" y="459"/>
+      <point x="162" y="472"/>
+      <point x="213" y="472" type="curve" smooth="yes"/>
+      <point x="309" y="472"/>
+      <point x="369" y="429"/>
+      <point x="369" y="361" type="curve" smooth="yes"/>
+      <point x="369" y="299"/>
+      <point x="317" y="261"/>
+      <point x="232" y="261" type="curve" smooth="yes"/>
+      <point x="143" y="261" type="line"/>
+      <point x="143" y="244" type="line"/>
+      <point x="224" y="244" type="line" smooth="yes"/>
+      <point x="318" y="244"/>
+      <point x="381" y="198"/>
+      <point x="381" y="124" type="curve" smooth="yes"/>
+      <point x="381" y="53"/>
+      <point x="319" y="12"/>
+      <point x="220" y="12" type="curve" smooth="yes"/>
+      <point x="162" y="12"/>
+      <point x="98" y="26"/>
+      <point x="51" y="49" type="curve"/>
+      <point x="46" y="31" type="line"/>
+      <point x="95" y="8"/>
+      <point x="154" y="-7"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
index 4f8772f2..785d52b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedescender-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="0499"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="cedillacomb" xOffset="98"/>
+    <component base="cedillacomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
index bc4e9eab..4841b2ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zedieresis-cy" format="2">
-  <advance width="447"/>
+  <advance width="479"/>
   <unicode hex="04DF"/>
   <outline>
     <component base="ze-cy"/>
-    <component base="dieresiscomb" xOffset="4"/>
+    <component base="dieresiscomb" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.glif
index 0fcc3232..b1381db0 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="605"/>
+  <advance width="601"/>
   <unicode hex="0030"/>
-  <anchor x="311" y="350" name="slash"/>
+  <anchor x="309" y="350" name="slash"/>
   <outline>
     <contour>
-      <point x="302" y="-10" type="curve" smooth="yes"/>
-      <point x="433" y="-10"/>
-      <point x="520" y="131"/>
-      <point x="520" y="343" type="curve" smooth="yes"/>
-      <point x="520" y="556"/>
-      <point x="434" y="699"/>
-      <point x="306" y="699" type="curve" smooth="yes"/>
-      <point x="173" y="699"/>
-      <point x="85" y="555"/>
-      <point x="85" y="340" type="curve" smooth="yes"/>
-      <point x="85" y="130"/>
-      <point x="172" y="-10"/>
+      <point x="300" y="-10" type="curve" smooth="yes"/>
+      <point x="431" y="-10"/>
+      <point x="518" y="131"/>
+      <point x="518" y="343" type="curve" smooth="yes"/>
+      <point x="518" y="556"/>
+      <point x="432" y="699"/>
+      <point x="304" y="699" type="curve" smooth="yes"/>
+      <point x="171" y="699"/>
+      <point x="83" y="555"/>
+      <point x="83" y="340" type="curve" smooth="yes"/>
+      <point x="83" y="130"/>
+      <point x="170" y="-10"/>
     </contour>
     <contour>
-      <point x="305" y="8" type="curve" smooth="yes"/>
-      <point x="186" y="8"/>
-      <point x="106" y="142"/>
-      <point x="106" y="343" type="curve" smooth="yes"/>
-      <point x="106" y="546"/>
-      <point x="185" y="681"/>
-      <point x="303" y="681" type="curve" smooth="yes"/>
-      <point x="421" y="681"/>
-      <point x="499" y="544"/>
-      <point x="499" y="340" type="curve" smooth="yes"/>
-      <point x="499" y="141"/>
-      <point x="421" y="8"/>
+      <point x="303" y="8" type="curve" smooth="yes"/>
+      <point x="184" y="8"/>
+      <point x="104" y="142"/>
+      <point x="104" y="343" type="curve" smooth="yes"/>
+      <point x="104" y="546"/>
+      <point x="183" y="681"/>
+      <point x="301" y="681" type="curve" smooth="yes"/>
+      <point x="419" y="681"/>
+      <point x="497" y="544"/>
+      <point x="497" y="340" type="curve" smooth="yes"/>
+      <point x="497" y="141"/>
+      <point x="419" y="8"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
index f3a94377..c3afa1ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="605"/>
-  <anchor x="311" y="300" name="slash"/>
+  <advance width="601"/>
+  <anchor x="309" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="302" y="-9" type="curve" smooth="yes"/>
-      <point x="433" y="-9"/>
-      <point x="520" y="112"/>
-      <point x="520" y="294" type="curve" smooth="yes"/>
-      <point x="520" y="477"/>
-      <point x="434" y="599"/>
-      <point x="306" y="599" type="curve" smooth="yes"/>
-      <point x="173" y="599"/>
-      <point x="85" y="476"/>
-      <point x="85" y="291" type="curve" smooth="yes"/>
-      <point x="85" y="111"/>
-      <point x="172" y="-9"/>
+      <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"/>
     </contour>
     <contour>
-      <point x="305" y="9" type="curve" smooth="yes"/>
-      <point x="186" y="9"/>
-      <point x="106" y="123"/>
-      <point x="106" y="294" type="curve" smooth="yes"/>
-      <point x="106" y="466"/>
-      <point x="185" y="581"/>
-      <point x="303" y="581" type="curve" smooth="yes"/>
-      <point x="421" y="581"/>
-      <point x="499" y="465"/>
-      <point x="499" y="291" type="curve" smooth="yes"/>
-      <point x="499" y="122"/>
-      <point x="421" y="9"/>
+      <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"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
index 3c667780..50d6f4b4 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="605"/>
+  <advance width="601"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="88" yOffset="49"/>
+    <component base="_slash.zero.osf" xOffset="86" yOffset="49"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
index defafc02..2d9ea7aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.tf.zero.glif
@@ -3,7 +3,7 @@
   <advance width="580"/>
   <outline>
     <component base="zero.tf"/>
-    <component base="_slash.zero" xOffset="96" yOffset="109"/>
+    <component base="_slash.zero" xOffset="94" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
index 4e1c3309..6e4b9a66 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.zero" format="2">
-  <advance width="605"/>
+  <advance width="601"/>
   <outline>
     <component base="zero"/>
-    <component base="_slash.zero" xOffset="88" yOffset="109"/>
+    <component base="_slash.zero" xOffset="86" yOffset="109"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
index cce563d1..81436718 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhe-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="0436"/>
-  <anchor x="681" y="0" name="bottomright"/>
-  <anchor x="345" y="480" name="top"/>
+  <anchor x="700" y="0" name="bottomright"/>
+  <anchor x="364" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="21" y="0" type="line"/>
-      <point x="46" y="0" type="line"/>
-      <point x="217" y="255" type="line"/>
-      <point x="58" y="480" type="line"/>
-      <point x="31" y="480" type="line"/>
-      <point x="197" y="251" type="line"/>
-      <point x="196" y="258" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="65" y="0" type="line"/>
+      <point x="236" y="255" type="line"/>
+      <point x="77" y="480" type="line"/>
+      <point x="50" y="480" type="line"/>
+      <point x="216" y="251" type="line"/>
+      <point x="215" y="258" type="line"/>
     </contour>
     <contour>
-      <point x="334" y="0" type="line"/>
-      <point x="355" y="0" type="line"/>
-      <point x="355" y="480" type="line"/>
-      <point x="334" y="480" type="line"/>
+      <point x="353" y="0" type="line"/>
+      <point x="374" y="0" type="line"/>
+      <point x="374" y="480" type="line"/>
+      <point x="353" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="196" y="246" type="line"/>
-      <point x="486" y="246" type="line"/>
-      <point x="486" y="263" type="line"/>
-      <point x="196" y="263" type="line"/>
+      <point x="215" y="246" type="line"/>
+      <point x="505" y="246" type="line"/>
+      <point x="505" y="263" type="line"/>
+      <point x="215" y="263" type="line"/>
     </contour>
     <contour>
-      <point x="642" y="0" type="line"/>
-      <point x="668" y="0" type="line"/>
-      <point x="492" y="259" type="line"/>
-      <point x="492" y="251" type="line"/>
-      <point x="658" y="480" type="line"/>
-      <point x="632" y="480" type="line"/>
-      <point x="472" y="254" type="line"/>
+      <point x="661" y="0" type="line"/>
+      <point x="687" y="0" type="line"/>
+      <point x="511" y="259" type="line"/>
+      <point x="511" y="251" type="line"/>
+      <point x="677" y="480" type="line"/>
+      <point x="651" y="480" type="line"/>
+      <point x="491" y="254" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
index eca4c36b..b3b7ee41 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhebreve-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="04C2"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="brevecomb-cy" xOffset="148"/>
+    <component base="brevecomb-cy" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
index 7af6761e..1464a3d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhedescender-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="749"/>
+  <advance width="771"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="descender-cy" xOffset="585"/>
+    <component base="descender-cy" xOffset="604"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>zhe-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
index 4e305bef..4a7616d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhedieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedieresis-cy" format="2">
-  <advance width="689"/>
+  <advance width="727"/>
   <unicode hex="04DD"/>
   <outline>
     <component base="zhe-cy"/>
-    <component base="dieresiscomb" xOffset="126"/>
+    <component base="dieresiscomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif 
b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif
index 0375c689..c9f08e83 100644
--- a/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif       
+++ b/src/Cantarell-Regular.ufo/glyphs.M_ay 5 19, 13_08/nine.glif       
@@ -5,4 +5,12 @@
   <outline>
     <component base="six" xScale="-1" yScale="-1" xOffset="597" yOffset="694"/>
   </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/E_f-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
index 758e7639..420fb17a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
@@ -38,4 +38,10 @@
       <point x="570" y="141"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
index 1968be5e..447a0e71 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_adescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="695"/>
+  <advance width="677"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
@@ -10,6 +10,8 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
index 7904c793..973d099e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_hedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zhedescender-cy" format="2">
-  <advance width="988"/>
+  <advance width="985"/>
   <unicode hex="0496"/>
   <outline>
     <component base="Zhe-cy"/>
@@ -12,6 +12,8 @@
       <string>Zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>Tse-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=Zhe-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
index 63ff8d4b..da513633 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
@@ -40,4 +40,10 @@
       <point x="226" y="503" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/backslash.glif b/src/Cantarell-Regular.ufo/glyphs/backslash.glif
index 2cbe6ba7..42a861ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/backslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/backslash.glif
@@ -7,10 +7,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|slash</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=|slash</string>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>slash</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/bullet.glif b/src/Cantarell-Regular.ufo/glyphs/bullet.glif
index d17fb7f4..551f4d97 100644
--- a/src/Cantarell-Regular.ufo/glyphs/bullet.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/bullet.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bullet" format="2">
-  <advance width="377"/>
+  <advance width="376"/>
   <unicode hex="2022"/>
   <outline>
     <contour>
@@ -18,4 +18,10 @@
       <point x="112" y="222"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
index 7949b3f4..30c70a70 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,41 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="542"/>
+  <advance width="541"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
-      <point x="224" y="171" type="curve" smooth="yes"/>
-      <point x="289" y="171"/>
-      <point x="364" y="192"/>
-      <point x="409" y="226" type="curve"/>
-      <point x="394" y="277" type="line"/>
-      <point x="355" y="255"/>
-      <point x="297" y="241"/>
-      <point x="249" y="241" type="curve" smooth="yes"/>
-      <point x="175" y="241"/>
-      <point x="129" y="276"/>
-      <point x="129" y="336" type="curve" smooth="yes"/>
-      <point x="129" y="482" type="line"/>
-      <point x="48" y="482" type="line"/>
-      <point x="48" y="301" type="line" smooth="yes"/>
-      <point x="48" y="222"/>
-      <point x="118" y="171"/>
+      <point x="223" y="171" type="curve" smooth="yes"/>
+      <point x="288" y="171"/>
+      <point x="363" y="192"/>
+      <point x="408" y="226" type="curve"/>
+      <point x="393" y="277" type="line"/>
+      <point x="354" y="255"/>
+      <point x="296" y="241"/>
+      <point x="248" y="241" type="curve" smooth="yes"/>
+      <point x="174" y="241"/>
+      <point x="128" y="276"/>
+      <point x="128" y="336" type="curve" smooth="yes"/>
+      <point x="128" y="482" type="line"/>
+      <point x="47" y="482" type="line"/>
+      <point x="47" y="301" type="line" smooth="yes"/>
+      <point x="47" y="222"/>
+      <point x="117" y="171"/>
     </contour>
     <contour>
-      <point x="223" y="53" type="line"/>
-      <point x="286" y="53" type="line"/>
-      <point x="286" y="378" type="line"/>
-      <point x="223" y="378" type="line"/>
+      <point x="222" y="53" type="line"/>
+      <point x="285" y="53" type="line"/>
+      <point x="285" y="378" type="line"/>
+      <point x="222" y="378" type="line"/>
     </contour>
     <contour>
-      <point x="378" y="0" type="line"/>
-      <point x="459" y="0" type="line"/>
-      <point x="459" y="482" type="line"/>
-      <point x="378" y="482" type="line"/>
+      <point x="377" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="482" type="line"/>
+      <point x="377" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>che-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>en-cy</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/colon.glif b/src/Cantarell-Regular.ufo/glyphs/colon.glif
index 8bd7a8f1..493ebbbc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/colon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/colon.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
       <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
       <string>period</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/exclam.glif b/src/Cantarell-Regular.ufo/glyphs/exclam.glif
index de5e59cc..d505ea6e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/exclam.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/exclam.glif
@@ -4,24 +4,24 @@
   <unicode hex="0021"/>
   <outline>
     <contour>
-      <point x="99" y="201" type="line"/>
-      <point x="163" y="201" type="line"/>
-      <point x="173" y="694" type="line"/>
-      <point x="89" y="694" type="line"/>
+      <point x="98" y="201" type="line"/>
+      <point x="162" y="201" type="line"/>
+      <point x="172" y="694" type="line"/>
+      <point x="88" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="132" y="-10" type="curve" smooth="yes"/>
-      <point x="170" y="-10"/>
-      <point x="196" y="17"/>
-      <point x="196" y="54" type="curve" smooth="yes"/>
-      <point x="196" y="91"/>
-      <point x="170" y="118"/>
-      <point x="132" y="118" type="curve" smooth="yes"/>
-      <point x="94" y="118"/>
-      <point x="68" y="91"/>
-      <point x="68" y="54" type="curve" smooth="yes"/>
-      <point x="68" y="17"/>
-      <point x="94" y="-10"/>
+      <point x="131" y="-10" type="curve" smooth="yes"/>
+      <point x="169" y="-10"/>
+      <point x="195" y="17"/>
+      <point x="195" y="54" type="curve" smooth="yes"/>
+      <point x="195" y="91"/>
+      <point x="169" y="118"/>
+      <point x="131" y="118" type="curve" smooth="yes"/>
+      <point x="93" y="118"/>
+      <point x="67" y="91"/>
+      <point x="67" y="54" type="curve" smooth="yes"/>
+      <point x="67" y="17"/>
+      <point x="93" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif 
b/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
index 25b3a122..67b045d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/exclamdown.glif
@@ -7,7 +7,9 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>exclam</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>exclam</string>
     </dict>
   </lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/figuredash.glif 
b/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
index b210d61d..19599e9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/figuredash.glif
@@ -10,4 +10,10 @@
       <point x="40" y="287" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>figurespace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
index 0a5d6ab5..8159d546 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hadescender-cy" format="2">
-  <advance width="497"/>
+  <advance width="495"/>
   <unicode hex="04B3"/>
   <outline>
     <component base="ha-cy"/>
@@ -11,7 +11,7 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ha-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>kadescender-cy</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
index fbaa15fc..30a82492 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kadescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kadescender-cy" format="2">
-  <advance width="538"/>
+  <advance width="545"/>
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
@@ -10,6 +10,10 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>ka-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=ka-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.glif b/src/Cantarell-Regular.ufo/glyphs/nine.glif
index d86474ea..12e87baa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.glif
@@ -5,4 +5,12 @@
   <outline>
     <component base="six" xScale="-1" yScale="-1" xOffset="583" yOffset="694"/>
   </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/numbersign.glif 
b/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
index 203e8446..7a5bb2e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/numbersign.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numbersign" format="2">
-  <advance width="652"/>
+  <advance width="653"/>
   <unicode hex="0023"/>
   <outline>
     <contour>
@@ -28,4 +28,10 @@
       <point x="34" y="519" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif 
b/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
index a197cf1e..69324987 100644
--- a/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/periodcentered.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="periodcentered" format="2">
-  <advance width="274"/>
+  <advance width="256"/>
   <unicode hex="00B7"/>
   <outline>
     <component base="period" yOffset="210"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>period</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>period</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/questiondown.glif 
b/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
index c42e0de3..b79b3b32 100644
--- a/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/questiondown.glif
@@ -7,8 +7,10 @@
   </outline>
   <lib>
     <dict>
-      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
-      <string>question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|question</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|question</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
index 67498e54..b47844b7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upA_rrow.glif
@@ -19,4 +19,10 @@ arrowup
       <point x="283" y="466" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
index 975b6bba..ad9d7a72 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zhedescender-cy" format="2">
-  <advance width="795"/>
+  <advance width="797"/>
   <unicode hex="0497"/>
   <outline>
     <component base="zhe-cy"/>
@@ -11,7 +11,9 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>zhe-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>tse-cy</string>
+      <string>zhe-cy</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=zhe-cy+10</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>


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