[cantarell-fonts/respacing] More glyphs keying



commit 701bd0de9cb8d320ececcfa309c30c5310bd86e2
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Thu May 30 23:21:03 2019 +0200

    More glyphs keying

 src/Cantarell-Bold.ufo/glyphs/B_.glif              |  80 +++++++++--------
 src/Cantarell-Bold.ufo/glyphs/C_.glif              |  64 +++++++------
 src/Cantarell-Bold.ufo/glyphs/C_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/C_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_.glif              |  48 +++++-----
 src/Cantarell-Bold.ufo/glyphs/E_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_breve.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif  |   6 +-
 src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif    |   4 +-
 .../glyphs/E_circumflexacute.glif                  |   4 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |   4 +-
 .../glyphs/E_circumflexhookabove.glif              |   4 +-
 .../glyphs/E_circumflextilde.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_grave.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_macron.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif   |   6 +-
 src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif |   2 +-
 src/Cantarell-Bold.ufo/glyphs/E_tilde.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/F_.glif              |  36 ++++----
 src/Cantarell-Bold.ufo/glyphs/G_.glif              |  74 ++++++++-------
 src/Cantarell-Bold.ufo/glyphs/G_breve.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/G_macron.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/K_.glif              |  34 ++++---
 src/Cantarell-Bold.ufo/glyphs/K_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_.glif              |  30 ++++---
 src/Cantarell-Bold.ufo/glyphs/L_J_.glif            |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_dot.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_j.glif             |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/L_slash.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/P_.glif              |  56 ++++++------
 src/Cantarell-Bold.ufo/glyphs/Q_.glif              |  68 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/R_.glif              |  64 +++++++------
 src/Cantarell-Bold.ufo/glyphs/R_acute.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_caron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/S_altillo.glif       |  12 ++-
 src/Cantarell-Bold.ufo/glyphs/T_horn.glif          |  48 +++++-----
 src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/a-cy.glif            |   2 +-
 src/Cantarell-Bold.ufo/glyphs/a.glif               |   8 +-
 src/Cantarell-Bold.ufo/glyphs/aacute.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abreve.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abreveacute.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif  |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif |   2 +-
 src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/acaron.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/acircumflex.glif     |   2 +-
 .../glyphs/acircumflexacute.glif                   |   2 +-
 .../glyphs/acircumflexdotbelow.glif                |   2 +-
 .../glyphs/acircumflexgrave.glif                   |   2 +-
 .../glyphs/acircumflexhookabove.glif               |   2 +-
 .../glyphs/acircumflextilde.glif                   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/adblgrave.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/adieresis.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/adotbelow.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/agrave.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ahookabove.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif  |   2 +-
 src/Cantarell-Bold.ufo/glyphs/amacron.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/aogonek.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/aring.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/aringacute.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/atilde.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/b.glif               |  10 ++-
 src/Cantarell-Bold.ufo/glyphs/d.glif               |  80 +++++++++--------
 src/Cantarell-Bold.ufo/glyphs/dcaron.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/dcroat.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dje-cy.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dzcaron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/e.glif               |  10 ++-
 src/Cantarell-Bold.ufo/glyphs/eacute.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ebreve.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ecaron.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif     |   2 +-
 .../glyphs/ecircumflexacute.glif                   |   2 +-
 .../glyphs/ecircumflexdotbelow.glif                |   2 +-
 .../glyphs/ecircumflexgrave.glif                   |   2 +-
 .../glyphs/ecircumflexhookabove.glif               |   2 +-
 .../glyphs/ecircumflextilde.glif                   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/edblgrave.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/edieresis.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/edotaccent.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/edotbelow.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/egrave.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ehookabove.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif  |   2 +-
 src/Cantarell-Bold.ufo/glyphs/emacron.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/emacronacute.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/eogonek.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/er-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/etilde.glif          |   2 +-
 src/Cantarell-Bold.ufo/glyphs/g.glif               | 100 +++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/gbreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/gmacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/h.glif               |  10 ++-
 src/Cantarell-Bold.ufo/glyphs/hbar.glif            |   2 +-
 src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif     |   2 +-
 src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ie-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/io-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/k.glif               |   6 ++
 src/Cantarell-Bold.ufo/glyphs/m.glif               |   8 ++
 src/Cantarell-Bold.ufo/glyphs/p.glif               |  10 ++-
 src/Cantarell-Bold.ufo/glyphs/q.glif               |  76 +++++++++-------
 src/Cantarell-Bold.ufo/glyphs/qa-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/r.glif               |  50 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/racute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rcaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif    |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif        |   2 +-
 src/Cantarell-Bold.ufo/glyphs/schwa.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/shha-cy.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif         |   2 +-
 src/Cantarell-Bold.ufo/glyphs/u.glif               |  60 +++++++------
 src/Cantarell-Bold.ufo/glyphs/uacute.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ubreve.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ucaron.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udblgrave.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresis.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/udotbelow.glif       |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ugrave.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhookabove.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorn.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhornacute.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/umacron.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uogonek.glif         |   4 +-
 src/Cantarell-Bold.ufo/glyphs/uring.glif           |   4 +-
 src/Cantarell-Bold.ufo/glyphs/utilde.glif          |   4 +-
 src/Cantarell-Bold.ufo/glyphs/utildeacute.glif     |   4 +-
 src/Cantarell-Bold.ufo/glyphs/v.glif               |   2 +-
 src/Cantarell-Bold.ufo/glyphs/y.glif               |   8 ++
 src/Cantarell-Light.ufo/glyphs/B_.glif             |  80 +++++++++--------
 src/Cantarell-Light.ufo/glyphs/C_.glif             |  64 +++++++------
 src/Cantarell-Light.ufo/glyphs/C_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedilla.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/C_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_.glif             |  48 +++++-----
 src/Cantarell-Light.ufo/glyphs/E_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_circumflex.glif   |   4 +-
 .../glyphs/E_circumflexacute.glif                  |   4 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |   4 +-
 .../glyphs/E_circumflexhookabove.glif              |   4 +-
 .../glyphs/E_circumflextilde.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_hookabove.glif    |   4 +-
 .../glyphs/E_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_macronacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_r-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_s-cy.glif         |   2 +-
 .../glyphs/E_sdescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/F_.glif             |  36 ++++----
 src/Cantarell-Light.ufo/glyphs/G_.glif             |  74 ++++++++-------
 src/Cantarell-Light.ufo/glyphs/G_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_o-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_.glif             |  34 ++++---
 src/Cantarell-Light.ufo/glyphs/K_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_.glif             |  30 ++++---
 src/Cantarell-Light.ufo/glyphs/L_J_.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dot.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_j.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_slash.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/P_.glif             |  56 ++++++------
 src/Cantarell-Light.ufo/glyphs/Q_.glif             |  68 +++++++-------
 src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/R_.glif             |  64 +++++++------
 src/Cantarell-Light.ufo/glyphs/R_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif     |   4 +-
 .../glyphs/R_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_altillo.glif      |  12 ++-
 src/Cantarell-Light.ufo/glyphs/T_horn.glif         |  48 +++++-----
 src/Cantarell-Light.ufo/glyphs/V_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/a-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/a.glif              |   8 +-
 src/Cantarell-Light.ufo/glyphs/aacute.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/abreve-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/abreve.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/abreveacute.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/abrevegrave.glif    |   2 +-
 .../glyphs/abrevehookabove.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/abrevetilde.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/acaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/acircumflex.glif    |   2 +-
 .../glyphs/acircumflexacute.glif                   |   2 +-
 .../glyphs/acircumflexdotbelow.glif                |   2 +-
 .../glyphs/acircumflexgrave.glif                   |   2 +-
 .../glyphs/acircumflexhookabove.glif               |   2 +-
 .../glyphs/acircumflextilde.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/adblgrave.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/adieresis.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/adotbelow.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/agrave.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ahookabove.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/amacron.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/aogonek.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/aring.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/aringacute.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/atilde.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/b.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/d.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/e.glif              |  10 ++-
 src/Cantarell-Light.ufo/glyphs/eacute.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ebreve.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ecaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/ecircumflex.glif    |   2 +-
 .../glyphs/ecircumflexacute.glif                   |   2 +-
 .../glyphs/ecircumflexdotbelow.glif                |   2 +-
 .../glyphs/ecircumflexgrave.glif                   |   2 +-
 .../glyphs/ecircumflexhookabove.glif               |   2 +-
 .../glyphs/ecircumflextilde.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/edblgrave.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/edieresis.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/edotaccent.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/edotbelow.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/egrave.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ehookabove.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/emacron.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/emacronacute.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/emacrongrave.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/eogonek.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/etilde.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/g.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/h.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/ie-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/io-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/k.glif              |   6 ++
 src/Cantarell-Light.ufo/glyphs/m.glif              |  10 ++-
 src/Cantarell-Light.ufo/glyphs/mdotbelow.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/p.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/q.glif              |   8 ++
 src/Cantarell-Light.ufo/glyphs/r.glif              |   6 ++
 src/Cantarell-Light.ufo/glyphs/schwa-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/schwa.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/u.glif              |  60 +++++++------
 src/Cantarell-Light.ufo/glyphs/uacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ubreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/udblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresisacute.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif |   4 +-
 .../glyphs/udieresismacron.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/udotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ugrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorn.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorngrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorntilde.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/umacron.glif        |   4 +-
 .../glyphs/umacrondieresis.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/uogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/uring.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/utilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/utildeacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/y.glif              |   8 ++
 src/Cantarell-Regular.ufo/glyphs/B_.glif           |  80 +++++++++--------
 src/Cantarell-Regular.ufo/glyphs/C_.glif           |  64 +++++++------
 src/Cantarell-Regular.ufo/glyphs/C_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif    |   4 +-
 .../glyphs/C_cedillaacute.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_.glif           |  48 +++++-----
 src/Cantarell-Regular.ufo/glyphs/E_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_caron.glif      |   4 +-
 .../glyphs/E_cedillabreve.glif                     |   6 +-
 src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif |   4 +-
 .../glyphs/E_circumflexacute.glif                  |   4 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |   4 +-
 .../glyphs/E_circumflexhookabove.glif              |   4 +-
 .../glyphs/E_circumflextilde.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_grave.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif  |   4 +-
 .../glyphs/E_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_macron.glif     |   4 +-
 .../glyphs/E_macronacute.glif                      |   6 +-
 .../glyphs/E_macrongrave.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif       |   2 +-
 .../glyphs/E_sdescender-cy.glif                    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/E_tilde.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/F_.glif           |  36 ++++----
 src/Cantarell-Regular.ufo/glyphs/G_.glif           |  74 ++++++++-------
 src/Cantarell-Regular.ufo/glyphs/G_breve.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_caron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif |   4 +-
 .../glyphs/G_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/G_macron.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/K_.glif           |  34 ++++---
 src/Cantarell-Regular.ufo/glyphs/K_acute.glif      |   4 +-
 .../glyphs/K_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_.glif           |  30 ++++---
 src/Cantarell-Regular.ufo/glyphs/L_J_.glif         |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_caron.glif      |   4 +-
 .../glyphs/L_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dot.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_j.glif          |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/L_slash.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/P_.glif           |  56 ++++++------
 src/Cantarell-Regular.ufo/glyphs/Q_.glif           |  68 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/R_.glif           |  64 +++++++------
 src/Cantarell-Regular.ufo/glyphs/R_acute.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_caron.glif      |   4 +-
 .../glyphs/R_commaaccent.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif   |   4 +-
 .../glyphs/R_invertedbreve.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/S_altillo.glif    |  12 ++-
 src/Cantarell-Regular.ufo/glyphs/T_horn.glif       |  48 +++++-----
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/a.glif            |   6 ++
 src/Cantarell-Regular.ufo/glyphs/b.glif            |  10 ++-
 src/Cantarell-Regular.ufo/glyphs/d.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/e.glif            |  78 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/eacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ebreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ecaron.glif       |   4 +-
 .../glyphs/ecedillabreve.glif                      |   6 +-
 src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif  |   4 +-
 .../glyphs/ecircumflexacute.glif                   |   4 +-
 .../glyphs/ecircumflexdotbelow.glif                |   6 +-
 .../glyphs/ecircumflexgrave.glif                   |   4 +-
 .../glyphs/ecircumflexhookabove.glif               |   4 +-
 .../glyphs/ecircumflextilde.glif                   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edieresis.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/edotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/egrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ehookabove.glif   |   4 +-
 .../glyphs/einvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/emacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/emacronacute.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif |   4 +-
 src/Cantarell-Regular.ufo/glyphs/eogonek.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/etilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/g.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/h.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/ie-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/io-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/k.glif            |   6 ++
 src/Cantarell-Regular.ufo/glyphs/m.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/p.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/q.glif            |   8 ++
 src/Cantarell-Regular.ufo/glyphs/r.glif            |   6 ++
 src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/schwa.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/u-cy.glif         |   2 +-
 src/Cantarell-Regular.ufo/glyphs/u.glif            |  60 +++++++------
 src/Cantarell-Regular.ufo/glyphs/uacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ubreve.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ucaron.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udblgrave.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/udieresis.glif    |   4 +-
 .../glyphs/udieresisacute.glif                     |   4 +-
 .../glyphs/udieresiscaron.glif                     |   4 +-
 .../glyphs/udieresisgrave.glif                     |   4 +-
 .../glyphs/udieresismacron.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/udotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ugrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorn.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhornacute.glif   |   4 +-
 .../glyphs/uhorndotbelow.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif   |   4 +-
 .../glyphs/uhornhookabove.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif   |   4 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   2 +-
 .../glyphs/uhungarumlaut.glif                      |   4 +-
 .../glyphs/uinvertedbreve.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/umacron.glif      |   4 +-
 .../glyphs/umacrondieresis.glif                    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uogonek.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/uring.glif        |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/utilde.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/utildeacute.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/y.glif            |  38 ++++----
 src/Cantarell-Regular.ufo/glyphs/yacute.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydieresis.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif    |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ygrave.glif       |   4 +-
 src/Cantarell-Regular.ufo/glyphs/yhookabove.glif   |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ymacron.glif      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ytilde.glif       |   4 +-
 522 files changed, 2344 insertions(+), 1846 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_.glif b/src/Cantarell-Bold.ufo/glyphs/B_.glif
index 2e4dd3ad..abfa265c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_.glif
@@ -1,48 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="652"/>
+  <advance width="640"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="306" y="0" name="bottom"/>
+  <anchor x="306" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="343" y="0" type="line" smooth="yes"/>
-      <point x="518" y="0"/>
-      <point x="634" y="91"/>
-      <point x="634" y="227" type="curve" smooth="yes"/>
-      <point x="634" y="350"/>
-      <point x="545" y="424"/>
-      <point x="394" y="424" type="curve" smooth="yes"/>
-      <point x="180" y="424" type="line"/>
-      <point x="180" y="292" type="line"/>
-      <point x="356" y="292" type="line" smooth="yes"/>
-      <point x="418" y="292"/>
-      <point x="454" y="260"/>
-      <point x="454" y="210" type="curve" smooth="yes"/>
-      <point x="454" y="161"/>
-      <point x="424" y="136"/>
-      <point x="366" y="136" type="curve" smooth="yes"/>
-      <point x="237" y="136" type="line"/>
-      <point x="237" y="558" type="line"/>
-      <point x="305" y="558" type="line" smooth="yes"/>
-      <point x="363" y="558"/>
-      <point x="401" y="530"/>
-      <point x="401" y="488" type="curve" smooth="yes"/>
-      <point x="401" y="450"/>
-      <point x="370" y="418"/>
-      <point x="314" y="401" type="curve"/>
-      <point x="448" y="374" type="line"/>
-      <point x="525" y="394"/>
-      <point x="575" y="457"/>
-      <point x="575" y="531" type="curve" smooth="yes"/>
-      <point x="575" y="638"/>
-      <point x="486" y="694"/>
-      <point x="315" y="694" type="curve" smooth="yes"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="331" y="0" type="line" smooth="yes"/>
+      <point x="506" y="0"/>
+      <point x="622" y="91"/>
+      <point x="622" y="227" type="curve" smooth="yes"/>
+      <point x="622" y="350"/>
+      <point x="533" y="424"/>
+      <point x="382" y="424" type="curve" smooth="yes"/>
+      <point x="168" y="424" type="line"/>
+      <point x="168" y="292" type="line"/>
+      <point x="344" y="292" type="line" smooth="yes"/>
+      <point x="406" y="292"/>
+      <point x="442" y="260"/>
+      <point x="442" y="210" type="curve" smooth="yes"/>
+      <point x="442" y="161"/>
+      <point x="412" y="136"/>
+      <point x="354" y="136" type="curve" smooth="yes"/>
+      <point x="225" y="136" type="line"/>
+      <point x="225" y="558" type="line"/>
+      <point x="293" y="558" type="line" smooth="yes"/>
+      <point x="351" y="558"/>
+      <point x="389" y="530"/>
+      <point x="389" y="488" type="curve" smooth="yes"/>
+      <point x="389" y="450"/>
+      <point x="358" y="418"/>
+      <point x="302" y="401" type="curve"/>
+      <point x="436" y="374" type="line"/>
+      <point x="513" y="394"/>
+      <point x="563" y="457"/>
+      <point x="563" y="531" type="curve" smooth="yes"/>
+      <point x="563" y="638"/>
+      <point x="474" y="694"/>
+      <point x="303" y="694" type="curve" smooth="yes"/>
+      <point x="55" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_.glif b/src/Cantarell-Bold.ufo/glyphs/C_.glif
index 58f98969..4774cd0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="349" y="0" name="bottom"/>
-  <anchor x="349" y="694" name="top"/>
+  <anchor x="348" y="0" name="bottom"/>
+  <anchor x="348" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="383" y="-10" type="curve" smooth="yes"/>
-      <point x="459" y="-10"/>
-      <point x="545" y="10"/>
-      <point x="598" y="39" type="curve"/>
-      <point x="560" y="164" type="line"/>
-      <point x="520" y="150"/>
-      <point x="469" y="142"/>
-      <point x="425" y="142" type="curve" smooth="yes"/>
-      <point x="285" y="142"/>
-      <point x="205" y="224"/>
-      <point x="205" y="359" type="curve" smooth="yes"/>
-      <point x="205" y="486"/>
-      <point x="276" y="551"/>
-      <point x="403" y="551" type="curve" smooth="yes"/>
-      <point x="458" y="551"/>
-      <point x="521" y="541"/>
-      <point x="559" y="525" type="curve"/>
-      <point x="607" y="661" type="line"/>
-      <point x="540" y="690"/>
-      <point x="475" y="704"/>
-      <point x="405" y="704" type="curve" smooth="yes"/>
-      <point x="181" y="704"/>
-      <point x="25" y="560"/>
-      <point x="25" y="342" type="curve" smooth="yes"/>
-      <point x="25" y="131"/>
-      <point x="171" y="-10"/>
+      <point x="382" y="-10" type="curve" smooth="yes"/>
+      <point x="458" y="-10"/>
+      <point x="544" y="10"/>
+      <point x="597" y="39" type="curve"/>
+      <point x="559" y="164" type="line"/>
+      <point x="519" y="150"/>
+      <point x="468" y="142"/>
+      <point x="424" y="142" type="curve" smooth="yes"/>
+      <point x="284" y="142"/>
+      <point x="204" y="224"/>
+      <point x="204" y="359" type="curve" smooth="yes"/>
+      <point x="204" y="486"/>
+      <point x="275" y="551"/>
+      <point x="402" y="551" type="curve" smooth="yes"/>
+      <point x="457" y="551"/>
+      <point x="520" y="541"/>
+      <point x="558" y="525" type="curve"/>
+      <point x="606" y="661" type="line"/>
+      <point x="539" y="690"/>
+      <point x="474" y="704"/>
+      <point x="404" y="704" type="curve" smooth="yes"/>
+      <point x="180" y="704"/>
+      <point x="24" y="560"/>
+      <point x="24" y="342" type="curve" smooth="yes"/>
+      <point x="24" y="131"/>
+      <point x="170" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
index 6f3be76b..42b82076 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <component base="acutecomb.case" xOffset="269"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
index ead3409d..ab827f2c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="135"/>
+    <component base="caroncomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
index 89f04157..3b7440d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="191"/>
+    <component base="cedillacomb" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
index 1ebfcd89..624bad4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="191"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <component base="cedillacomb" xOffset="190"/>
+    <component base="acutecomb.case" xOffset="269"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
index 3dae54a2..3cff8546 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="150"/>
+    <component base="circumflexcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
index ec6c2877..810311ea 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="204"/>
+    <component base="dotaccentcomb.case" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_.glif b/src/Cantarell-Bold.ufo/glyphs/E_.glif
index 2be05acc..4e03ee38 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="15" y="694" name="topleft"/>
+  <anchor x="308" y="0" name="bottom"/>
+  <anchor x="506" y="10" name="ogonek"/>
+  <anchor x="301" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="228" y="0" type="line"/>
+      <point x="228" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="147" y="0" type="line"/>
-      <point x="565" y="0" type="line"/>
-      <point x="565" y="152" type="line"/>
-      <point x="147" y="152" type="line"/>
+      <point x="135" y="0" type="line"/>
+      <point x="553" y="0" type="line"/>
+      <point x="553" y="152" type="line"/>
+      <point x="135" y="152" type="line"/>
     </contour>
     <contour>
-      <point x="147" y="276" type="line"/>
-      <point x="537" y="276" type="line"/>
-      <point x="537" y="428" type="line"/>
-      <point x="147" y="428" type="line"/>
+      <point x="135" y="276" type="line"/>
+      <point x="525" y="276" type="line"/>
+      <point x="525" y="428" type="line"/>
+      <point x="135" y="428" type="line"/>
     </contour>
     <contour>
-      <point x="147" y="542" type="line"/>
-      <point x="565" y="542" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="147" y="694" type="line"/>
+      <point x="135" y="542" type="line"/>
+      <point x="553" y="542" type="line"/>
+      <point x="553" y="694" type="line"/>
+      <point x="135" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
index bbdbab4e..5b9fbc4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="234"/>
+    <component base="acutecomb.case" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
index e3c053fe..53e3b6f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="80"/>
+    <component base="brevecomb.case" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
index 111e3506..baca4545 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="99"/>
+    <component base="caroncomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
index a332589f..e7809be6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="162"/>
-    <component base="brevecomb.case" xOffset="80"/>
+    <component base="cedillacomb" xOffset="150"/>
+    <component base="brevecomb.case" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
index 19274220..774ccef0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="114"/>
+    <component base="circumflexcomb.case" xOffset="102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
index a54845e8..740673a4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="160" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="148" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
index 6255fb0b..ce520618 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="170"/>
-    <component base="circumflexcomb.case" xOffset="114"/>
+    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="circumflexcomb.case" xOffset="102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
index e06b4797..0a638539 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="160" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="148" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
index 14206462..e56c26a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="160" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="148" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
index 72ae77bc..d072fcee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="140" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="128" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
index c2d6d046..e9473f53 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="30"/>
+    <component base="dblgravecomb.case" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
index 09b53ec9..46a82b82 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="38"/>
+    <component base="dieresiscomb.case" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
index b8f55595..b85e5f91 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="168"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
index 881e0c40..fe74a052 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="170"/>
+    <component base="dotbelowcomb" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
index 832f6e7f..ee9ad512 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="84"/>
+    <component base="gravecomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
index fbead794..63b475de 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="158"/>
+    <component base="hookabovecomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
index aa457686..ebd67d85 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="82"/>
+    <component base="breveinvertedcomb.case" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
index d4695a59..4a87c573 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
+    <component base="macroncomb.case" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
index 39ccc9e5..309e62aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
-    <component base="acutecomb.case" xOffset="234" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="62"/>
+    <component base="acutecomb.case" xOffset="222" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
index 3949a0c5..0eb507a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="74"/>
-    <component base="gravecomb.case" xOffset="84" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="62"/>
+    <component base="gravecomb.case" xOffset="72" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
index 544746b5..3f3a8c33 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0118"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="58"/>
+    <component base="ogonekcomb" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
index 6151ce27..18bfb972 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="626"/>
+  <advance width="614"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
index dd2838b4..84ba8b0a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="0421"/>
   <anchor x="342" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
index 113f8341..0bb2ad8a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="624"/>
+  <advance width="623"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
index 10ef98ff..c5ca77eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="84"/>
+    <component base="tildecomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_.glif b/src/Cantarell-Bold.ufo/glyphs/F_.glif
index bf8f3765..9e6075a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/F_.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="583"/>
+  <advance width="571"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="278" y="694" name="top"/>
+  <anchor x="159" y="0" name="bottom"/>
+  <anchor x="266" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="243" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="231" y="0" type="line"/>
+      <point x="231" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="147" y="257" type="line"/>
-      <point x="526" y="257" type="line"/>
-      <point x="526" y="409" type="line"/>
-      <point x="147" y="409" type="line"/>
+      <point x="135" y="257" type="line"/>
+      <point x="514" y="257" type="line"/>
+      <point x="514" y="409" type="line"/>
+      <point x="135" y="409" type="line"/>
     </contour>
     <contour>
-      <point x="147" y="542" type="line"/>
-      <point x="562" y="542" type="line"/>
-      <point x="562" y="694" type="line"/>
-      <point x="147" y="694" type="line"/>
+      <point x="135" y="542" type="line"/>
+      <point x="550" y="542" type="line"/>
+      <point x="550" y="694" type="line"/>
+      <point x="135" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_.glif b/src/Cantarell-Bold.ufo/glyphs/G_.glif
index 8184a829..7eed816d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="351" y="0" name="bottom"/>
-  <anchor x="371" y="694" name="top"/>
+  <anchor x="350" y="0" name="bottom"/>
+  <anchor x="370" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="389" y="-10" type="curve" smooth="yes"/>
-      <point x="499" y="-10"/>
-      <point x="593" y="23"/>
-      <point x="671" y="89" type="curve"/>
-      <point x="671" y="411" type="line"/>
-      <point x="359" y="411" type="line"/>
-      <point x="359" y="265" type="line"/>
-      <point x="506" y="265" type="line"/>
-      <point x="506" y="79" type="line"/>
-      <point x="532" y="180" type="line"/>
-      <point x="509" y="155"/>
-      <point x="465" y="140"/>
-      <point x="410" y="140" type="curve" smooth="yes"/>
-      <point x="285" y="140"/>
-      <point x="207" y="221"/>
-      <point x="207" y="353" type="curve" smooth="yes"/>
-      <point x="207" y="482"/>
-      <point x="282" y="551"/>
-      <point x="423" y="551" type="curve" smooth="yes"/>
-      <point x="482" y="551"/>
-      <point x="551" y="540"/>
-      <point x="597" y="524" type="curve"/>
-      <point x="645" y="660" type="line"/>
-      <point x="586" y="688"/>
-      <point x="507" y="704"/>
-      <point x="428" y="704" type="curve" smooth="yes"/>
-      <point x="182" y="704"/>
-      <point x="25" y="556"/>
-      <point x="25" y="339" type="curve" smooth="yes"/>
-      <point x="25" y="130"/>
-      <point x="171" y="-10"/>
+      <point x="388" y="-10" type="curve" smooth="yes"/>
+      <point x="498" y="-10"/>
+      <point x="592" y="23"/>
+      <point x="670" y="89" type="curve"/>
+      <point x="670" y="411" type="line"/>
+      <point x="358" y="411" type="line"/>
+      <point x="358" y="265" type="line"/>
+      <point x="505" y="265" type="line"/>
+      <point x="505" y="79" type="line"/>
+      <point x="531" y="180" type="line"/>
+      <point x="508" y="155"/>
+      <point x="464" y="140"/>
+      <point x="409" y="140" type="curve" smooth="yes"/>
+      <point x="284" y="140"/>
+      <point x="206" y="221"/>
+      <point x="206" y="353" type="curve" smooth="yes"/>
+      <point x="206" y="482"/>
+      <point x="281" y="551"/>
+      <point x="422" y="551" type="curve" smooth="yes"/>
+      <point x="481" y="551"/>
+      <point x="550" y="540"/>
+      <point x="596" y="524" type="curve"/>
+      <point x="644" y="660" type="line"/>
+      <point x="585" y="688"/>
+      <point x="506" y="704"/>
+      <point x="427" y="704" type="curve" smooth="yes"/>
+      <point x="181" y="704"/>
+      <point x="24" y="556"/>
+      <point x="24" y="339" type="curve" smooth="yes"/>
+      <point x="24" y="130"/>
+      <point x="170" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
index 9800cb33..96c69a23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="138"/>
+    <component base="brevecomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
index 4e55bd07..3095f0f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="157"/>
+    <component base="caroncomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
index 75625c15..abb5ea59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="172"/>
+    <component base="circumflexcomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
index ebb5cfbd..804acdd0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="233"/>
+    <component base="commaaccentcomb" xOffset="232"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
index ab8c01bd..5f3a1a69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="226"/>
+    <component base="dotaccentcomb.case" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
index 00c2ba6a..e73148f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="712"/>
+  <advance width="711"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="132"/>
+    <component base="macroncomb.case" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
index cf41788e..2c01ddb9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0415"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
index f8ade2d5..5c5b9273 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
index eb287def..17a08d62 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
index f65b6679..919108db 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="610"/>
+  <advance width="598"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_.glif b/src/Cantarell-Bold.ufo/glyphs/K_.glif
index 0a1fe60e..6cee5483 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_.glif
@@ -1,27 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="686"/>
+  <advance width="673"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="338" y="0" name="bottom"/>
-  <anchor x="338" y="694" name="top"/>
+  <anchor x="325" y="0" name="bottom"/>
+  <anchor x="325" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="466" y="0" type="line"/>
-      <point x="698" y="0" type="line"/>
-      <point x="431" y="394" type="line"/>
-      <point x="434" y="360" type="line"/>
-      <point x="682" y="694" type="line"/>
-      <point x="473" y="694" type="line"/>
-      <point x="233" y="363" type="line"/>
+      <point x="453" y="0" type="line"/>
+      <point x="685" y="0" type="line"/>
+      <point x="418" y="394" type="line"/>
+      <point x="421" y="360" type="line"/>
+      <point x="669" y="694" type="line"/>
+      <point x="460" y="694" type="line"/>
+      <point x="220" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="68" y="0" type="line"/>
-      <point x="246" y="0" type="line"/>
-      <point x="246" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="233" y="0" type="line"/>
+      <point x="233" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
index 8bb30acd..b5aab542 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="686"/>
+  <advance width="673"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="246"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
index 193eff06..84890b2f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="686"/>
+  <advance width="673"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="220"/>
+    <component base="commaaccentcomb" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_.glif b/src/Cantarell-Bold.ufo/glyphs/L_.glif
index 981f4acd..58f77038 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="268" y="0" name="bottom"/>
-  <anchor x="166" y="377" name="center"/>
-  <anchor x="537" y="352" name="periodcentered"/>
-  <anchor x="152" y="694" name="top"/>
-  <anchor x="367" y="490" name="topright"/>
+  <anchor x="256" y="0" name="bottom"/>
+  <anchor x="154" y="377" name="center"/>
+  <anchor x="525" y="352" name="periodcentered"/>
+  <anchor x="140" y="694" name="top"/>
+  <anchor x="355" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="527" y="0" type="line"/>
-      <point x="527" y="153" type="line"/>
-      <point x="240" y="153" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="515" y="0" type="line"/>
+      <point x="515" y="153" type="line"/>
+      <point x="228" y="153" type="line"/>
+      <point x="228" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
index 8dc46854..75e8e4bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="992"/>
+  <advance width="980"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="537"/>
+    <component base="J" xOffset="525"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
index ed193d76..5c9ec99c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="73"/>
+    <component base="acutecomb.case" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
index cb916d30..fa3183d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="244" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="232" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
index 3fbe4c55..f1a09608 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="150"/>
+    <component base="commaaccentcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
index 7aeda72c..b539b704 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="537"/>
+    <component base="periodcentered.loclCAT.case" xOffset="525"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
index dd2ee9e1..9f2e2c22 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="118"/>
+    <component base="dotbelowcomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_j.glif b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
index ea452b2d..4e1af392 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="824"/>
+  <advance width="812"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="537"/>
+    <component base="j" xOffset="525"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
index 5190ba03..5e81c75f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="23"/>
+    <component base="macronbelowcomb" xOffset="11"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
index 65a0e8ca..ae1f4987 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="537"/>
+  <advance width="525"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-61" yOffset="107"/>
+    <component base="slashshortcomb.case" xOffset="-73" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_.glif b/src/Cantarell-Bold.ufo/glyphs/P_.glif
index d463fb94..404042f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="626"/>
+  <advance width="614"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="325" y="0" name="bottom"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="313" y="0" name="bottom"/>
+  <anchor x="313" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="228" y="0" type="line"/>
+      <point x="228" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="176" y="204" type="line"/>
-      <point x="297" y="204" type="line" smooth="yes"/>
-      <point x="485" y="204"/>
-      <point x="609" y="307"/>
-      <point x="609" y="463" type="curve" smooth="yes"/>
-      <point x="609" y="608"/>
-      <point x="503" y="694"/>
-      <point x="326" y="694" type="curve" smooth="yes"/>
-      <point x="176" y="694" type="line"/>
-      <point x="176" y="542" type="line"/>
-      <point x="312" y="542" type="line" smooth="yes"/>
-      <point x="382" y="542"/>
-      <point x="429" y="504"/>
-      <point x="429" y="446" type="curve" smooth="yes"/>
-      <point x="429" y="390"/>
-      <point x="390" y="356"/>
-      <point x="328" y="356" type="curve" smooth="yes"/>
-      <point x="176" y="356" type="line"/>
+      <point x="164" y="204" type="line"/>
+      <point x="285" y="204" type="line" smooth="yes"/>
+      <point x="473" y="204"/>
+      <point x="597" y="307"/>
+      <point x="597" y="463" type="curve" smooth="yes"/>
+      <point x="597" y="608"/>
+      <point x="491" y="694"/>
+      <point x="314" y="694" type="curve" smooth="yes"/>
+      <point x="164" y="694" type="line"/>
+      <point x="164" y="542" type="line"/>
+      <point x="300" y="542" type="line" smooth="yes"/>
+      <point x="370" y="542"/>
+      <point x="417" y="504"/>
+      <point x="417" y="446" type="curve" smooth="yes"/>
+      <point x="417" y="390"/>
+      <point x="378" y="356"/>
+      <point x="316" y="356" type="curve" smooth="yes"/>
+      <point x="164" y="356" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_.glif b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
index c99f67ae..92a1a6bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="760"/>
+  <advance width="758"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="380" y="694" name="top"/>
+  <anchor x="378" y="0" name="bottom"/>
+  <anchor x="378" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="373" y="-10" type="curve" smooth="yes"/>
-      <point x="590" y="-10"/>
-      <point x="734" y="134"/>
-      <point x="734" y="351" type="curve" smooth="yes"/>
-      <point x="734" y="563"/>
-      <point x="594" y="704"/>
-      <point x="384" y="704" type="curve" smooth="yes"/>
-      <point x="169" y="704"/>
-      <point x="26" y="559"/>
-      <point x="26" y="341" type="curve" smooth="yes"/>
-      <point x="26" y="130"/>
-      <point x="165" y="-10"/>
+      <point x="371" y="-10" type="curve" smooth="yes"/>
+      <point x="588" y="-10"/>
+      <point x="732" y="134"/>
+      <point x="732" y="351" type="curve" smooth="yes"/>
+      <point x="732" y="563"/>
+      <point x="592" y="704"/>
+      <point x="382" y="704" type="curve" smooth="yes"/>
+      <point x="167" y="704"/>
+      <point x="24" y="559"/>
+      <point x="24" y="341" type="curve" smooth="yes"/>
+      <point x="24" y="130"/>
+      <point x="163" y="-10"/>
     </contour>
     <contour>
-      <point x="384" y="140" type="curve" smooth="yes"/>
-      <point x="271" y="140"/>
-      <point x="204" y="218"/>
-      <point x="204" y="351" type="curve" smooth="yes"/>
-      <point x="204" y="479"/>
-      <point x="267" y="554"/>
-      <point x="373" y="554" type="curve" smooth="yes"/>
-      <point x="488" y="554"/>
-      <point x="556" y="475"/>
-      <point x="556" y="341" type="curve" smooth="yes"/>
-      <point x="556" y="215"/>
-      <point x="492" y="140"/>
+      <point x="382" y="140" type="curve" smooth="yes"/>
+      <point x="269" y="140"/>
+      <point x="202" y="218"/>
+      <point x="202" y="351" type="curve" smooth="yes"/>
+      <point x="202" y="479"/>
+      <point x="265" y="554"/>
+      <point x="371" y="554" type="curve" smooth="yes"/>
+      <point x="486" y="554"/>
+      <point x="554" y="475"/>
+      <point x="554" y="341" type="curve" smooth="yes"/>
+      <point x="554" y="215"/>
+      <point x="490" y="140"/>
     </contour>
     <contour>
-      <point x="644" y="-63" type="line"/>
-      <point x="752" y="38" type="line"/>
-      <point x="427" y="348" type="line"/>
-      <point x="323" y="245" type="line"/>
+      <point x="642" y="-63" type="line"/>
+      <point x="750" y="38" type="line"/>
+      <point x="425" y="348" type="line"/>
+      <point x="321" y="245" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
index 520862d2..79189740 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="760"/>
+  <advance width="758"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_.glif b/src/Cantarell-Bold.ufo/glyphs/R_.glif
index e5f01620..c900eefe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_.glif
@@ -1,44 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
+  <anchor x="312" y="0" name="bottom"/>
+  <anchor x="312" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="228" y="0" type="line"/>
+      <point x="228" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="188" y="237" type="line"/>
-      <point x="329" y="237" type="line" smooth="yes"/>
-      <point x="499" y="237"/>
-      <point x="612" y="338"/>
-      <point x="612" y="484" type="curve" smooth="yes"/>
-      <point x="612" y="618"/>
-      <point x="516" y="694"/>
-      <point x="353" y="694" type="curve" smooth="yes"/>
-      <point x="188" y="694" type="line"/>
-      <point x="188" y="543" type="line"/>
-      <point x="329" y="543" type="line" smooth="yes"/>
-      <point x="394" y="543"/>
-      <point x="432" y="512"/>
-      <point x="432" y="460" type="curve" smooth="yes"/>
-      <point x="432" y="413"/>
-      <point x="404" y="384"/>
-      <point x="353" y="384" type="curve" smooth="yes"/>
-      <point x="188" y="384" type="line"/>
+      <point x="176" y="237" type="line"/>
+      <point x="317" y="237" type="line" smooth="yes"/>
+      <point x="487" y="237"/>
+      <point x="600" y="338"/>
+      <point x="600" y="484" type="curve" smooth="yes"/>
+      <point x="600" y="618"/>
+      <point x="504" y="694"/>
+      <point x="341" y="694" type="curve" smooth="yes"/>
+      <point x="176" y="694" type="line"/>
+      <point x="176" y="543" type="line"/>
+      <point x="317" y="543" type="line" smooth="yes"/>
+      <point x="382" y="543"/>
+      <point x="420" y="512"/>
+      <point x="420" y="460" type="curve" smooth="yes"/>
+      <point x="420" y="413"/>
+      <point x="392" y="384"/>
+      <point x="341" y="384" type="curve" smooth="yes"/>
+      <point x="176" y="384" type="line"/>
     </contour>
     <contour>
-      <point x="452" y="0" type="line"/>
-      <point x="660" y="0" type="line"/>
-      <point x="472" y="297" type="line"/>
-      <point x="283" y="297" type="line"/>
+      <point x="440" y="0" type="line"/>
+      <point x="648" y="0" type="line"/>
+      <point x="460" y="297" type="line"/>
+      <point x="271" y="297" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
index 037f0697..1120243b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
index 95721bb8..c7293dc7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="110"/>
+    <component base="caroncomb.case" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
index 6f3b66c0..8e8e8f1b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="206"/>
+    <component base="commaaccentcomb" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
index dccaa447..5d9dfb9c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="41"/>
+    <component base="dblgravecomb.case" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
index b5a7ac08..650305b4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="174"/>
+    <component base="dotbelowcomb" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
index e9daee8e..6fd58c5a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="93"/>
+    <component base="breveinvertedcomb.case" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
index 32a4a31f..5a94ebc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="663"/>
+  <advance width="651"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="79"/>
+    <component base="macronbelowcomb" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif b/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
index d5a563b9..979647cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="290"/>
+  <advance width="300"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="10" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
index 481a6680..fed3e40b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="626"/>
+  <advance width="614"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="240" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="228" y="0" type="line"/>
+      <point x="228" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="176" y="116" type="line"/>
-      <point x="312" y="116" type="line" smooth="yes"/>
-      <point x="490" y="116"/>
-      <point x="609" y="216"/>
-      <point x="609" y="365" type="curve" smooth="yes"/>
-      <point x="609" y="510"/>
-      <point x="495" y="606"/>
-      <point x="326" y="606" type="curve" smooth="yes"/>
-      <point x="176" y="606" type="line"/>
-      <point x="176" y="454" type="line"/>
-      <point x="317" y="454" type="line" smooth="yes"/>
-      <point x="385" y="454"/>
-      <point x="429" y="415"/>
-      <point x="429" y="355" type="curve" smooth="yes"/>
-      <point x="429" y="299"/>
-      <point x="393" y="268"/>
-      <point x="328" y="268" type="curve" smooth="yes"/>
-      <point x="176" y="268" type="line"/>
+      <point x="164" y="116" type="line"/>
+      <point x="300" y="116" type="line" smooth="yes"/>
+      <point x="478" y="116"/>
+      <point x="597" y="216"/>
+      <point x="597" y="365" type="curve" smooth="yes"/>
+      <point x="597" y="510"/>
+      <point x="483" y="606"/>
+      <point x="314" y="606" type="curve" smooth="yes"/>
+      <point x="164" y="606" type="line"/>
+      <point x="164" y="454" type="line"/>
+      <point x="305" y="454" type="line" smooth="yes"/>
+      <point x="373" y="454"/>
+      <point x="417" y="415"/>
+      <point x="417" y="355" type="curve" smooth="yes"/>
+      <point x="417" y="299"/>
+      <point x="381" y="268"/>
+      <point x="316" y="268" type="curve" smooth="yes"/>
+      <point x="164" y="268" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
index c610cdfa..c4482295 100644
--- a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="652"/>
+  <advance width="640"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
index 7707967e..4b11f4b1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a-cy" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0430"/>
   <anchor x="264" y="490" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/a.glif b/src/Cantarell-Bold.ufo/glyphs/a.glif
index 3f817d27..47e07ec9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/a.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/a.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0061"/>
   <note>
 a
@@ -51,4 +51,10 @@ a
       <point x="89" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aacute.glif b/src/Cantarell-Bold.ufo/glyphs/aacute.glif
index 46ce8674..99d6e7f7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aacute" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
index 75679849..228db8bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve-cy" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreve.glif b/src/Cantarell-Bold.ufo/glyphs/abreve.glif
index 2ffde5f2..61ffb244 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0103"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif b/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
index be2a7eee..ae3d157c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreveacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreveacute" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
index ec4a38e1..40c576cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevedotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevedotbelow" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EB7"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif b/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
index f39bc40d..75ba2645 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevegrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevegrave" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
index 75115f0a..d9ddc7c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevehookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevehookabove" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif b/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
index b5477684..6a4db06a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abrevetilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevetilde" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acaron.glif b/src/Cantarell-Bold.ufo/glyphs/acaron.glif
index a4b76737..611b6c13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acaron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acaron" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="01CE"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
index eec22927..dc2c8bb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflex" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E2"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
index 4b2c5377..d7d546da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexacute" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
index f75785af..f9526a4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexdotbelow" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EAD"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
index 186dc42b..76e38f67 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexgrave" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
index b9f4acc5..e05365a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexhookabove" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
index 3a7a1df1..8c6e86eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acircumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflextilde" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
index 010fc10e..60d71e7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adblgrave" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0201"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
index c648bafd..b2f572ac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis-cy" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adieresis.glif b/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
index 490837fe..2bd9d695 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
index dbb44f5e..1288af46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adotbelow" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EA1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/agrave.glif b/src/Cantarell-Bold.ufo/glyphs/agrave.glif
index a2b7ec74..08a39877 100644
--- a/src/Cantarell-Bold.ufo/glyphs/agrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/agrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="agrave" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E0"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
index 0a67d5d7..cbae3a9e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ahookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ahookabove" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="1EA3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
index d41209aa..23aed663 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ainvertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ainvertedbreve" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0203"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/amacron.glif b/src/Cantarell-Bold.ufo/glyphs/amacron.glif
index 98e31562..64377230 100644
--- a/src/Cantarell-Bold.ufo/glyphs/amacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/amacron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="amacron" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0101"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aogonek.glif b/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
index 3e5011b5..b021c0de 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aogonek" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="0105"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aring.glif b/src/Cantarell-Bold.ufo/glyphs/aring.glif
index 446cfa8c..cd6f7bdd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aring.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aring" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aringacute.glif b/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
index af719fd8..dd57ee25 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aringacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aringacute" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="01FB"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/atilde.glif b/src/Cantarell-Bold.ufo/glyphs/atilde.glif
index 5cf59979..6f3b617b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/atilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/atilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="atilde" format="2">
-  <advance width="528"/>
+  <advance width="530"/>
   <unicode hex="00E3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/b.glif b/src/Cantarell-Bold.ufo/glyphs/b.glif
index 7b29b605..ae20b268 100644
--- a/src/Cantarell-Bold.ufo/glyphs/b.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/b.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="576"/>
+  <advance width="573"/>
   <unicode hex="0062"/>
   <note>
 b
@@ -44,4 +44,12 @@ b
       <point x="247" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/d.glif b/src/Cantarell-Bold.ufo/glyphs/d.glif
index 27b2752a..d013efcf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/d.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/d.glif
@@ -1,49 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="d" format="2">
-  <advance width="576"/>
+  <advance width="573"/>
   <unicode hex="0064"/>
   <note>
 d
 </note>
-  <anchor x="284" y="0" name="bottom"/>
-  <anchor x="413" y="600" name="center"/>
-  <anchor x="288" y="490" name="top"/>
-  <anchor x="628" y="490" name="topright"/>
+  <anchor x="281" y="0" name="bottom"/>
+  <anchor x="410" y="600" name="center"/>
+  <anchor x="285" y="490" name="top"/>
+  <anchor x="625" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="416" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-      <point x="522" y="739" type="line"/>
-      <point x="356" y="739" type="line"/>
-      <point x="356" y="120" type="line"/>
+      <point x="413" y="0" type="line"/>
+      <point x="519" y="0" type="line"/>
+      <point x="519" y="739" type="line"/>
+      <point x="353" y="739" type="line"/>
+      <point x="353" y="120" type="line"/>
     </contour>
     <contour>
-      <point x="228" y="-10" type="curve" smooth="yes"/>
-      <point x="299" y="-10"/>
-      <point x="357" y="25"/>
-      <point x="393" y="85" type="curve"/>
-      <point x="364" y="179" type="line"/>
-      <point x="347" y="151"/>
-      <point x="318" y="134"/>
-      <point x="283" y="134" type="curve" smooth="yes"/>
-      <point x="229" y="134"/>
-      <point x="197" y="176"/>
-      <point x="197" y="248" type="curve" smooth="yes"/>
-      <point x="197" y="316"/>
-      <point x="228" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="317" y="356"/>
-      <point x="348" y="338"/>
-      <point x="365" y="308" type="curve"/>
-      <point x="401" y="416" type="line"/>
-      <point x="370" y="472"/>
-      <point x="318" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="113" y="500"/>
-      <point x="21" y="397"/>
-      <point x="21" y="241" type="curve" smooth="yes"/>
-      <point x="21" y="89"/>
-      <point x="108" y="-10"/>
+      <point x="225" y="-10" type="curve" smooth="yes"/>
+      <point x="296" y="-10"/>
+      <point x="354" y="25"/>
+      <point x="390" y="85" type="curve"/>
+      <point x="361" y="179" type="line"/>
+      <point x="344" y="151"/>
+      <point x="315" y="134"/>
+      <point x="280" y="134" type="curve" smooth="yes"/>
+      <point x="226" y="134"/>
+      <point x="194" y="176"/>
+      <point x="194" y="248" type="curve" smooth="yes"/>
+      <point x="194" y="316"/>
+      <point x="225" y="356"/>
+      <point x="278" y="356" type="curve" smooth="yes"/>
+      <point x="314" y="356"/>
+      <point x="345" y="338"/>
+      <point x="362" y="308" type="curve"/>
+      <point x="398" y="416" type="line"/>
+      <point x="367" y="472"/>
+      <point x="315" y="500"/>
+      <point x="247" y="500" type="curve" smooth="yes"/>
+      <point x="110" y="500"/>
+      <point x="18" y="397"/>
+      <point x="18" y="241" type="curve" smooth="yes"/>
+      <point x="18" y="89"/>
+      <point x="105" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dcaron.glif b/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
index 144fdc99..47abc744 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="010F"/>
   <outline>
     <component base="d"/>
-    <component base="caroncomb.alt" xOffset="505" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="502" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dcroat.glif b/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
index 134e6895..28231f49 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dcroat.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dcroat" format="2">
-  <advance width="576"/>
+  <advance width="573"/>
   <unicode hex="0111"/>
   <outline>
     <component base="d"/>
-    <component base="strokeshortcomb" xOffset="198" yOffset="301"/>
+    <component base="strokeshortcomb" xOffset="195" yOffset="301"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
index d0e3c063..631931eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ddotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ddotbelow" format="2">
-  <advance width="576"/>
+  <advance width="573"/>
   <unicode hex="1E0D"/>
   <outline>
     <component base="d"/>
-    <component base="dotbelowcomb" xOffset="134"/>
+    <component base="dotbelowcomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
index 05e61880..b9e9d03b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dje-cy" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="0452"/>
   <outline>
     <component base="tshe-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
index 2205ba5e..2c1f0365 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dlinebelow" format="2">
-  <advance width="576"/>
+  <advance width="573"/>
   <unicode hex="1E0F"/>
   <outline>
     <component base="d"/>
-    <component base="macronbelowcomb" xOffset="39"/>
+    <component base="macronbelowcomb" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif b/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
index f524fe0d..bf545344 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dzcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzcaron" format="2">
-  <advance width="1066"/>
+  <advance width="1063"/>
   <unicode hex="01C6"/>
   <outline>
     <component base="d"/>
-    <component base="zcaron" xOffset="576"/>
+    <component base="zcaron" xOffset="573"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/e.glif b/src/Cantarell-Bold.ufo/glyphs/e.glif
index 74995e0c..c64556ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/e.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/e.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0065"/>
   <note>
 e
@@ -43,4 +43,12 @@ e
       <point x="126" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eacute.glif b/src/Cantarell-Bold.ufo/glyphs/eacute.glif
index caa46fab..60bc05c1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ebreve.glif b/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
index 7879cc03..f3b16a10 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ebreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecaron.glif b/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
index 4232df5f..33ce6c73 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecaron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
index 5556cd26..b7129595 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecedillabreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
index fddde2f4..0b5e3735 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
index 47c5224e..8992fa24 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
index bc6618bf..9a708ade 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
index f0a7af10..4af31637 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
index 0863444e..fb907657 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
index e717c4c4..6c197998 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ecircumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
index c5c19407..c385c812 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edieresis.glif b/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
index 3f5d3c0b..83b3a656 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
index 34d3cd32..b4fbb016 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
index 4daafd52..7bb09854 100644
--- a/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/edotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/egrave.glif b/src/Cantarell-Bold.ufo/glyphs/egrave.glif
index 8286f6e4..53a237cd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/egrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
index abfe3873..21caa78b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ehookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
index f2800bbc..ff5c7466 100644
--- a/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/einvertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacron.glif b/src/Cantarell-Bold.ufo/glyphs/emacron.glif
index 55988f5a..93bc7f11 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif b/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
index 78d82b06..0fe0e898 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacronacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif b/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
index 3701f8eb..a25151f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emacrongrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eogonek.glif b/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
index 7e78a0a4..f35b6e15 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/er-cy.glif b/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
index 07193d00..78499f28 100644
--- a/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/er-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="er-cy" format="2">
-  <advance width="574"/>
+  <advance width="572"/>
   <unicode hex="0440"/>
   <outline>
     <component base="p"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etilde.glif b/src/Cantarell-Bold.ufo/glyphs/etilde.glif
index 7f7ef8de..8c9aae24 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/g.glif b/src/Cantarell-Bold.ufo/glyphs/g.glif
index 1a27a0fd..1be2b5a8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/g.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/g.glif
@@ -1,59 +1,67 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="g" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="0067"/>
   <note>
 g
 </note>
-  <anchor x="295" y="0" name="bottom"/>
-  <anchor x="265" y="490" name="top"/>
+  <anchor x="291" y="0" name="bottom"/>
+  <anchor x="261" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="242" y="-232" type="curve" smooth="yes"/>
-      <point x="411" y="-232"/>
-      <point x="524" y="-138"/>
-      <point x="524" y="2" type="curve" smooth="yes"/>
-      <point x="524" y="490" type="line"/>
-      <point x="401" y="490" type="line"/>
-      <point x="356" y="370" type="line"/>
-      <point x="356" y="2" type="line" smooth="yes"/>
-      <point x="356" y="-59"/>
-      <point x="311" y="-94"/>
-      <point x="234" y="-94" type="curve" smooth="yes"/>
-      <point x="194" y="-94"/>
-      <point x="146" y="-84"/>
-      <point x="105" y="-67" type="curve"/>
-      <point x="72" y="-195" type="line"/>
-      <point x="127" y="-220"/>
-      <point x="182" y="-232"/>
+      <point x="238" y="-232" type="curve" smooth="yes"/>
+      <point x="407" y="-232"/>
+      <point x="520" y="-138"/>
+      <point x="520" y="2" type="curve" smooth="yes"/>
+      <point x="520" y="490" type="line"/>
+      <point x="397" y="490" type="line"/>
+      <point x="352" y="370" type="line"/>
+      <point x="352" y="2" type="line" smooth="yes"/>
+      <point x="352" y="-59"/>
+      <point x="307" y="-94"/>
+      <point x="230" y="-94" type="curve" smooth="yes"/>
+      <point x="190" y="-94"/>
+      <point x="142" y="-84"/>
+      <point x="101" y="-67" type="curve"/>
+      <point x="68" y="-195" type="line"/>
+      <point x="123" y="-220"/>
+      <point x="178" y="-232"/>
     </contour>
     <contour>
-      <point x="228" y="-10" type="curve" smooth="yes"/>
-      <point x="315" y="-10"/>
-      <point x="382" y="43"/>
-      <point x="414" y="131" type="curve"/>
-      <point x="369" y="184" type="line"/>
-      <point x="354" y="153"/>
-      <point x="323" y="134"/>
-      <point x="283" y="134" type="curve" smooth="yes"/>
-      <point x="230" y="134"/>
-      <point x="198" y="176"/>
-      <point x="198" y="248" type="curve" smooth="yes"/>
-      <point x="198" y="316"/>
-      <point x="229" y="356"/>
-      <point x="281" y="356" type="curve" smooth="yes"/>
-      <point x="324" y="356"/>
-      <point x="359" y="330"/>
-      <point x="373" y="283" type="curve"/>
-      <point x="418" y="383" type="line"/>
-      <point x="393" y="460"/>
-      <point x="335" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="115" y="500"/>
-      <point x="22" y="397"/>
-      <point x="22" y="240" type="curve" smooth="yes"/>
-      <point x="22" y="88"/>
-      <point x="109" y="-10"/>
+      <point x="224" y="-10" type="curve" smooth="yes"/>
+      <point x="311" y="-10"/>
+      <point x="378" y="43"/>
+      <point x="410" y="131" type="curve"/>
+      <point x="365" y="184" type="line"/>
+      <point x="350" y="153"/>
+      <point x="319" y="134"/>
+      <point x="279" y="134" type="curve" smooth="yes"/>
+      <point x="226" y="134"/>
+      <point x="194" y="176"/>
+      <point x="194" y="248" type="curve" smooth="yes"/>
+      <point x="194" y="316"/>
+      <point x="225" y="356"/>
+      <point x="277" y="356" type="curve" smooth="yes"/>
+      <point x="320" y="356"/>
+      <point x="355" y="330"/>
+      <point x="369" y="283" type="curve"/>
+      <point x="414" y="383" type="line"/>
+      <point x="389" y="460"/>
+      <point x="331" y="500"/>
+      <point x="246" y="500" type="curve" smooth="yes"/>
+      <point x="111" y="500"/>
+      <point x="18" y="397"/>
+      <point x="18" y="240" type="curve" smooth="yes"/>
+      <point x="18" y="88"/>
+      <point x="105" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gbreve.glif b/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
index e6e2789e..e4cfc1a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gbreve" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="011F"/>
   <outline>
     <component base="g"/>
-    <component base="brevecomb" xOffset="49"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcaron.glif b/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
index 9051dcbe..c4cc8229 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcaron" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="01E7"/>
   <outline>
     <component base="g"/>
-    <component base="caroncomb" xOffset="59"/>
+    <component base="caroncomb" xOffset="55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
index 5e4b0e13..d067417c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcircumflex" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="011D"/>
   <outline>
     <component base="g"/>
-    <component base="circumflexcomb" xOffset="62"/>
+    <component base="circumflexcomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
index ac1690b0..a9c2512d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcommaaccent" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="0123"/>
   <outline>
     <component base="g"/>
-    <component base="commaturnedabovecomb" xOffset="119"/>
+    <component base="commaturnedabovecomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
index 3a1b69e2..b92e825a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gdotaccent" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="0121"/>
   <outline>
     <component base="g"/>
-    <component base="dotaccentcomb" xOffset="121"/>
+    <component base="dotaccentcomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gmacron.glif b/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
index e927a408..f2ca1837 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gmacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gmacron" format="2">
-  <advance width="578"/>
+  <advance width="574"/>
   <unicode hex="1E21"/>
   <outline>
     <component base="g"/>
-    <component base="macroncomb" xOffset="23"/>
+    <component base="macroncomb" xOffset="19"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/h.glif b/src/Cantarell-Bold.ufo/glyphs/h.glif
index 60d02cb2..7bf036ff 100644
--- a/src/Cantarell-Bold.ufo/glyphs/h.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/h.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="h" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="0068"/>
   <note>
 h
@@ -34,4 +34,12 @@ h
       <point x="363" y="265" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hbar.glif b/src/Cantarell-Bold.ufo/glyphs/hbar.glif
index 09c6c482..8799195d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hbar.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbar" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="0127"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif b/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
index 0d2c590a..fbd647d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hbrevebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbrevebelow" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="1E2B"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
index 0deac443..7b2e3bad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hcircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hcircumflex" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="0125"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
index 87a92b0d..d25f0b55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hdotbelow" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="1E25"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
index bf2bd3d0..6d11ce66 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0435"/>
   <anchor x="263" y="490" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
index 11197bc3..7750a5b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
index 86885463..c64d1859 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
index 6d839b9b..b14228ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/k.glif b/src/Cantarell-Bold.ufo/glyphs/k.glif
index 249d885c..5a3554d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/k.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/k.glif
@@ -24,4 +24,10 @@ k
       <point x="215" y="257" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/m.glif b/src/Cantarell-Bold.ufo/glyphs/m.glif
index b31f406e..4e54d3b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/m.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/m.glif
@@ -52,4 +52,12 @@ m
       <point x="687" y="265" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/p.glif b/src/Cantarell-Bold.ufo/glyphs/p.glif
index 9b8fa1f2..7d669758 100644
--- a/src/Cantarell-Bold.ufo/glyphs/p.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/p.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="p" format="2">
-  <advance width="574"/>
+  <advance width="572"/>
   <unicode hex="0070"/>
   <note>
 p
@@ -44,4 +44,12 @@ p
       <point x="256" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/q.glif b/src/Cantarell-Bold.ufo/glyphs/q.glif
index a0351a2a..b06bb059 100644
--- a/src/Cantarell-Bold.ufo/glyphs/q.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/q.glif
@@ -1,47 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="q" format="2">
-  <advance width="577"/>
+  <advance width="573"/>
   <unicode hex="0071"/>
   <note>
 q
 </note>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="291" y="490" name="top"/>
+  <anchor x="287" y="0" name="bottom"/>
+  <anchor x="287" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="357" y="-217" type="line"/>
-      <point x="523" y="-217" type="line"/>
-      <point x="523" y="490" type="line"/>
-      <point x="408" y="490" type="line"/>
-      <point x="357" y="370" type="line"/>
+      <point x="353" y="-217" type="line"/>
+      <point x="519" y="-217" type="line"/>
+      <point x="519" y="490" type="line"/>
+      <point x="404" y="490" type="line"/>
+      <point x="353" y="370" type="line"/>
     </contour>
     <contour>
-      <point x="230" y="-10" type="curve" smooth="yes"/>
-      <point x="317" y="-10"/>
-      <point x="382" y="43"/>
-      <point x="415" y="130" type="curve"/>
-      <point x="370" y="184" type="line"/>
-      <point x="354" y="153"/>
-      <point x="324" y="134"/>
-      <point x="284" y="134" type="curve" smooth="yes"/>
-      <point x="230" y="134"/>
-      <point x="198" y="176"/>
-      <point x="198" y="248" type="curve" smooth="yes"/>
-      <point x="198" y="316"/>
-      <point x="229" y="356"/>
-      <point x="282" y="356" type="curve" smooth="yes"/>
-      <point x="323" y="356"/>
-      <point x="354" y="333"/>
-      <point x="370" y="294" type="curve"/>
-      <point x="419" y="383" type="line"/>
-      <point x="394" y="460"/>
-      <point x="336" y="500"/>
-      <point x="250" y="500" type="curve" smooth="yes"/>
-      <point x="114" y="500"/>
-      <point x="22" y="397"/>
-      <point x="22" y="242" type="curve" smooth="yes"/>
-      <point x="22" y="91"/>
-      <point x="106" y="-10"/>
+      <point x="226" y="-10" type="curve" smooth="yes"/>
+      <point x="313" y="-10"/>
+      <point x="378" y="43"/>
+      <point x="411" y="130" type="curve"/>
+      <point x="366" y="184" type="line"/>
+      <point x="350" y="153"/>
+      <point x="320" y="134"/>
+      <point x="280" y="134" type="curve" smooth="yes"/>
+      <point x="226" y="134"/>
+      <point x="194" y="176"/>
+      <point x="194" y="248" type="curve" smooth="yes"/>
+      <point x="194" y="316"/>
+      <point x="225" y="356"/>
+      <point x="278" y="356" type="curve" smooth="yes"/>
+      <point x="319" y="356"/>
+      <point x="350" y="333"/>
+      <point x="366" y="294" type="curve"/>
+      <point x="415" y="383" type="line"/>
+      <point x="390" y="460"/>
+      <point x="332" y="500"/>
+      <point x="246" y="500" type="curve" smooth="yes"/>
+      <point x="110" y="500"/>
+      <point x="18" y="397"/>
+      <point x="18" y="242" type="curve" smooth="yes"/>
+      <point x="18" y="91"/>
+      <point x="102" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
index 9b4ffcbd..2e2a53bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/qa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="qa-cy" format="2">
-  <advance width="577"/>
+  <advance width="573"/>
   <unicode hex="051B"/>
   <outline>
     <component base="q"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/r.glif b/src/Cantarell-Bold.ufo/glyphs/r.glif
index 627292f3..82621119 100644
--- a/src/Cantarell-Bold.ufo/glyphs/r.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/r.glif
@@ -1,35 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="r" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0072"/>
   <note>
 r
 </note>
-  <anchor x="142" y="0" name="bottom"/>
-  <anchor x="214" y="490" name="top"/>
+  <anchor x="141" y="0" name="bottom"/>
+  <anchor x="213" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="299" type="line"/>
-      <point x="190" y="490" type="line"/>
-      <point x="55" y="490" type="line"/>
+      <point x="54" y="0" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="227" y="299" type="line"/>
+      <point x="189" y="490" type="line"/>
+      <point x="54" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="197" y="252" type="line"/>
-      <point x="224" y="309"/>
-      <point x="271" y="342"/>
-      <point x="325" y="342" type="curve" smooth="yes"/>
-      <point x="351" y="342"/>
-      <point x="381" y="335"/>
-      <point x="402" y="324" type="curve"/>
-      <point x="441" y="472" type="line"/>
-      <point x="417" y="486"/>
-      <point x="384" y="494"/>
-      <point x="354" y="494" type="curve" smooth="yes"/>
-      <point x="291" y="494"/>
-      <point x="233" y="460"/>
-      <point x="197" y="402" type="curve"/>
+      <point x="196" y="252" type="line"/>
+      <point x="223" y="309"/>
+      <point x="270" y="342"/>
+      <point x="324" y="342" type="curve" smooth="yes"/>
+      <point x="350" y="342"/>
+      <point x="380" y="335"/>
+      <point x="401" y="324" type="curve"/>
+      <point x="440" y="472" type="line"/>
+      <point x="416" y="486"/>
+      <point x="383" y="494"/>
+      <point x="353" y="494" type="curve" smooth="yes"/>
+      <point x="290" y="494"/>
+      <point x="232" y="460"/>
+      <point x="196" y="402" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/racute.glif b/src/Cantarell-Bold.ufo/glyphs/racute.glif
index 68a78a45..31b74526 100644
--- a/src/Cantarell-Bold.ufo/glyphs/racute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/racute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="racute" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0155"/>
   <outline>
     <component base="r"/>
-    <component base="acutecomb" xOffset="118"/>
+    <component base="acutecomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rcaron.glif b/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
index 9837491f..45ac8634 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcaron" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0159"/>
   <outline>
     <component base="r"/>
-    <component base="caroncomb" xOffset="8"/>
+    <component base="caroncomb" xOffset="7"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
index e718f6bb..12b18fa0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcommaaccent" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0157"/>
   <outline>
     <component base="r"/>
-    <component base="commaaccentcomb" xOffset="24"/>
+    <component base="commaaccentcomb" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
index 7f4e891c..97d5fdb0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rdblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdblgrave" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0211"/>
   <outline>
     <component base="r"/>
-    <component base="dblgravecomb" xOffset="-87"/>
+    <component base="dblgravecomb" xOffset="-88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
index b2c45c19..08e7a3a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdotbelow" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="1E5B"/>
   <outline>
     <component base="r"/>
-    <component base="dotbelowcomb" xOffset="-8"/>
+    <component base="dotbelowcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
index 57e25871..f508cd87 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rinvertedbreve" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="0213"/>
   <outline>
     <component base="r"/>
-    <component base="breveinvertedcomb" xOffset="-12"/>
+    <component base="breveinvertedcomb" xOffset="-13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
index f4339c6a..e72facd9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rlinebelow" format="2">
-  <advance width="435"/>
+  <advance width="434"/>
   <unicode hex="1E5F"/>
   <outline>
     <component base="r"/>
-    <component base="macronbelowcomb.narrow" xOffset="-76"/>
+    <component base="macronbelowcomb.narrow" xOffset="-77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
index cfc85fa0..dc50773a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/schwa.glif b/src/Cantarell-Bold.ufo/glyphs/schwa.glif
index 4a387f7c..00daccd0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="526"/>
+  <advance width="516"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="526" yOffset="490"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="516" yOffset="490"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
index d4813a3e..06a4a091 100644
--- a/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/shha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shha-cy" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="04BB"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
index b1ecb053..bb90a640 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tshe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tshe-cy" format="2">
-  <advance width="579"/>
+  <advance width="578"/>
   <unicode hex="045B"/>
   <anchor x="449" y="0" name="bottom"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u.glif b/src/Cantarell-Bold.ufo/glyphs/u.glif
index 2f3a3faa..c842fc9a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0075"/>
   <note>
 u
 </note>
-  <anchor x="282" y="0" name="bottom"/>
-  <anchor x="476" y="10" name="ogonek"/>
-  <anchor x="282" y="490" name="top"/>
-  <anchor x="522" y="490" name="topright"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="474" y="10" name="ogonek"/>
+  <anchor x="280" y="490" name="top"/>
+  <anchor x="520" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="523" y="490" type="line"/>
-      <point x="350" y="490" type="line"/>
-      <point x="350" y="114" type="line"/>
-      <point x="398" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
+      <point x="521" y="490" type="line"/>
+      <point x="348" y="490" type="line"/>
+      <point x="348" y="114" type="line"/>
+      <point x="396" y="0" type="line"/>
+      <point x="521" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="217" y="490" type="line"/>
-      <point x="44" y="490" type="line"/>
-      <point x="44" y="186" type="line" smooth="yes"/>
-      <point x="44" y="68"/>
-      <point x="112" y="-6"/>
-      <point x="216" y="-6" type="curve" smooth="yes"/>
-      <point x="284" y="-6"/>
-      <point x="345" y="25"/>
-      <point x="385" y="82" type="curve"/>
-      <point x="366" y="185" type="line"/>
-      <point x="344" y="160"/>
-      <point x="316" y="144"/>
-      <point x="282" y="144" type="curve" smooth="yes"/>
-      <point x="225" y="144"/>
-      <point x="217" y="189"/>
-      <point x="217" y="225" type="curve" smooth="yes"/>
+      <point x="215" y="490" type="line"/>
+      <point x="42" y="490" type="line"/>
+      <point x="42" y="186" type="line" smooth="yes"/>
+      <point x="42" y="68"/>
+      <point x="110" y="-6"/>
+      <point x="214" y="-6" type="curve" smooth="yes"/>
+      <point x="282" y="-6"/>
+      <point x="343" y="25"/>
+      <point x="383" y="82" type="curve"/>
+      <point x="364" y="185" type="line"/>
+      <point x="342" y="160"/>
+      <point x="314" y="144"/>
+      <point x="280" y="144" type="curve" smooth="yes"/>
+      <point x="223" y="144"/>
+      <point x="215" y="189"/>
+      <point x="215" y="225" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uacute.glif b/src/Cantarell-Bold.ufo/glyphs/uacute.glif
index a3c8c239..c29798bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ubreve.glif b/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
index 4257c18b..de7d6708 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="66"/>
+    <component base="brevecomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ucaron.glif b/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
index 22f6be1a..74888305 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="76"/>
+    <component base="caroncomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
index 31b6e23b..8d430e0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="79"/>
+    <component base="circumflexcomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
index 24030dc0..ea4e9c18 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="-19"/>
+    <component base="dblgravecomb" xOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresis.glif b/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
index 1cd38caa..d36c5b47 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="13"/>
+    <component base="dieresiscomb" xOffset="11"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
index c926d985..faab01ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="26"/>
+    <component base="dieresiscomb_acutecomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
index 20fb1174..a9b6d804 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="26"/>
+    <component base="dieresiscomb_caroncomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
index c8875ee0..ffb3bf31 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="26"/>
+    <component base="dieresiscomb_gravecomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
index 3a63be6a..491a9137 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="26"/>
+    <component base="dieresiscomb_macroncomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
index 6d5b07a9..5da0fc13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ugrave.glif b/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
index 2ec0aa1c..e5ecf374 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif b/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
index 4529768a..e5e832dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorn.glif b/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
index acf189b6..fb9d6449 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="451" yOffset="8"/>
+    <component base="horncomb" xOffset="449" yOffset="8"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif b/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
index 19ed1347..8d87fd16 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="186"/>
+    <component base="acutecomb" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
index e83d8839..f2bff587 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="132"/>
+    <component base="dotbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif b/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
index 9c2c06cd..713d628a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="84"/>
+    <component base="gravecomb" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
index 609eebf4..7c56b129 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="128"/>
+    <component base="hookabovecomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif b/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
index 363865a0..278cf474 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="730"/>
+  <advance width="728"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
index eeaeac05..f156106b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="67"/>
+    <component base="hungarumlautcomb" xOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
index 5af34b1d..76f8bbfb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="56"/>
+    <component base="breveinvertedcomb" xOffset="54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacron.glif b/src/Cantarell-Bold.ufo/glyphs/umacron.glif
index d3f11cee..5114358d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="40"/>
+    <component base="macroncomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
index bf34e0c6..4f1f6c54 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-10"/>
+    <component base="macroncomb_dieresiscomb" xOffset="-12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uogonek.glif b/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
index 04d2ebe8..67ac8429 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="16"/>
+    <component base="ogonekcomb" xOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uring.glif b/src/Cantarell-Bold.ufo/glyphs/uring.glif
index afb0b582..511e51b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="116"/>
+    <component base="ringcomb" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/utilde.glif b/src/Cantarell-Bold.ufo/glyphs/utilde.glif
index 857667f6..2ef07817 100644
--- a/src/Cantarell-Bold.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="47"/>
+    <component base="tildecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
index a1a3e758..cd399cc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="577"/>
+  <advance width="575"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="47"/>
+    <component base="tildecomb_acutecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/v.glif b/src/Cantarell-Bold.ufo/glyphs/v.glif
index 07047555..07ebe52a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/v.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/v.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="v" format="2">
-  <advance width="534"/>
+  <advance width="535"/>
   <unicode hex="0076"/>
   <note>
 v
diff --git a/src/Cantarell-Bold.ufo/glyphs/y.glif b/src/Cantarell-Bold.ufo/glyphs/y.glif
index e128f82d..38d4622f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/y.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/y.glif
@@ -25,4 +25,12 @@ y
       <point x="180" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_.glif b/src/Cantarell-Light.ufo/glyphs/B_.glif
index 09eeafbd..4a7e85f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_.glif
@@ -1,48 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="619"/>
+  <advance width="613"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="267" y="694" name="top"/>
+  <anchor x="261" y="0" name="bottom"/>
+  <anchor x="261" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="319" y="0" type="line" smooth="yes"/>
-      <point x="473" y="0"/>
-      <point x="557" y="68"/>
-      <point x="557" y="185" type="curve" smooth="yes"/>
-      <point x="557" y="300"/>
-      <point x="475" y="373"/>
-      <point x="353" y="373" type="curve" smooth="yes"/>
-      <point x="124" y="373" type="line"/>
-      <point x="124" y="356" type="line"/>
-      <point x="343" y="356" type="line" smooth="yes"/>
-      <point x="462" y="356"/>
-      <point x="535" y="288"/>
-      <point x="535" y="181" type="curve" smooth="yes"/>
-      <point x="535" y="75"/>
-      <point x="464" y="18"/>
-      <point x="330" y="18" type="curve" smooth="yes"/>
-      <point x="130" y="18" type="line"/>
-      <point x="130" y="676" type="line"/>
-      <point x="286" y="676" type="line" smooth="yes"/>
-      <point x="414" y="676"/>
-      <point x="484" y="622"/>
-      <point x="484" y="521" type="curve" smooth="yes"/>
-      <point x="484" y="442"/>
-      <point x="441" y="388"/>
-      <point x="357" y="369" type="curve"/>
-      <point x="383" y="365" type="line"/>
-      <point x="457" y="379"/>
-      <point x="506" y="444"/>
-      <point x="506" y="528" type="curve" smooth="yes"/>
-      <point x="506" y="635"/>
-      <point x="427" y="694"/>
-      <point x="286" y="694" type="curve" smooth="yes"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="313" y="0" type="line" smooth="yes"/>
+      <point x="467" y="0"/>
+      <point x="551" y="68"/>
+      <point x="551" y="185" type="curve" smooth="yes"/>
+      <point x="551" y="300"/>
+      <point x="469" y="373"/>
+      <point x="347" y="373" type="curve" smooth="yes"/>
+      <point x="118" y="373" type="line"/>
+      <point x="118" y="356" type="line"/>
+      <point x="337" y="356" type="line" smooth="yes"/>
+      <point x="456" y="356"/>
+      <point x="529" y="288"/>
+      <point x="529" y="181" type="curve" smooth="yes"/>
+      <point x="529" y="75"/>
+      <point x="458" y="18"/>
+      <point x="324" y="18" type="curve" smooth="yes"/>
+      <point x="124" y="18" type="line"/>
+      <point x="124" y="676" type="line"/>
+      <point x="280" y="676" type="line" smooth="yes"/>
+      <point x="408" y="676"/>
+      <point x="478" y="622"/>
+      <point x="478" y="521" type="curve" smooth="yes"/>
+      <point x="478" y="442"/>
+      <point x="435" y="388"/>
+      <point x="351" y="369" type="curve"/>
+      <point x="377" y="365" type="line"/>
+      <point x="451" y="379"/>
+      <point x="500" y="444"/>
+      <point x="500" y="528" type="curve" smooth="yes"/>
+      <point x="500" y="635"/>
+      <point x="421" y="694"/>
+      <point x="280" y="694" type="curve" smooth="yes"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_.glif b/src/Cantarell-Light.ufo/glyphs/C_.glif
index c446232b..cb744409 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="359" y="0" name="bottom"/>
-  <anchor x="359" y="694" name="top"/>
+  <anchor x="353" y="0" name="bottom"/>
+  <anchor x="353" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="395" y="-10" type="curve" smooth="yes"/>
-      <point x="461" y="-10"/>
-      <point x="535" y="6"/>
-      <point x="596" y="33" type="curve"/>
-      <point x="591" y="49" type="line"/>
-      <point x="531" y="24"/>
-      <point x="459" y="9"/>
-      <point x="399" y="9" type="curve" smooth="yes"/>
-      <point x="216" y="9"/>
-      <point x="92" y="145"/>
-      <point x="92" y="348" type="curve" smooth="yes"/>
-      <point x="92" y="549"/>
-      <point x="219" y="683"/>
-      <point x="409" y="683" type="curve" smooth="yes"/>
-      <point x="469" y="683"/>
-      <point x="532" y="670"/>
-      <point x="590" y="645" type="curve"/>
-      <point x="597" y="662" type="line"/>
-      <point x="539" y="689"/>
-      <point x="476" y="702"/>
-      <point x="412" y="702" type="curve" smooth="yes"/>
-      <point x="207" y="702"/>
-      <point x="70" y="556"/>
-      <point x="70" y="338" type="curve" smooth="yes"/>
-      <point x="70" y="129"/>
-      <point x="201" y="-10"/>
+      <point x="389" y="-10" type="curve" smooth="yes"/>
+      <point x="455" y="-10"/>
+      <point x="529" y="6"/>
+      <point x="590" y="33" type="curve"/>
+      <point x="585" y="49" type="line"/>
+      <point x="525" y="24"/>
+      <point x="453" y="9"/>
+      <point x="393" y="9" type="curve" smooth="yes"/>
+      <point x="210" y="9"/>
+      <point x="86" y="145"/>
+      <point x="86" y="348" type="curve" smooth="yes"/>
+      <point x="86" y="549"/>
+      <point x="213" y="683"/>
+      <point x="403" y="683" type="curve" smooth="yes"/>
+      <point x="463" y="683"/>
+      <point x="526" y="670"/>
+      <point x="584" y="645" type="curve"/>
+      <point x="591" y="662" type="line"/>
+      <point x="533" y="689"/>
+      <point x="470" y="702"/>
+      <point x="406" y="702" type="curve" smooth="yes"/>
+      <point x="201" y="702"/>
+      <point x="64" y="556"/>
+      <point x="64" y="338" type="curve" smooth="yes"/>
+      <point x="64" y="129"/>
+      <point x="195" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_acute.glif b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
index f61122ff..82b62086 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="acutecomb.case" xOffset="295"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_caron.glif b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
index c22b3cfe..50fcc04c 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="184"/>
+    <component base="caroncomb.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
index 7a918c63..41f7e250 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="234"/>
+    <component base="cedillacomb" xOffset="228"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
index 5630b756..0a714f66 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="234"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="cedillacomb" xOffset="228"/>
+    <component base="acutecomb.case" xOffset="295"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
index c3d3d6d5..521476d9 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="182"/>
+    <component base="circumflexcomb.case" xOffset="176"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
index 3a620b09..edf47f90 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="240"/>
+    <component base="dotaccentcomb.case" xOffset="234"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index ca883f78..5e6b7941 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="-7" y="694" name="topleft"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="492" y="10" name="ogonek"/>
+  <anchor x="297" y="694" name="top"/>
+  <anchor x="-13" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="0" type="line"/>
-      <point x="504" y="0" type="line"/>
-      <point x="504" y="18" type="line"/>
-      <point x="119" y="18" type="line"/>
+      <point x="113" y="0" type="line"/>
+      <point x="498" y="0" type="line"/>
+      <point x="498" y="18" type="line"/>
+      <point x="113" y="18" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="355" type="line"/>
-      <point x="477" y="355" type="line"/>
-      <point x="477" y="373" type="line"/>
-      <point x="119" y="373" type="line"/>
+      <point x="113" y="355" type="line"/>
+      <point x="471" y="355" type="line"/>
+      <point x="471" y="373" type="line"/>
+      <point x="113" y="373" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="676" type="line"/>
-      <point x="504" y="676" type="line"/>
-      <point x="504" y="694" type="line"/>
-      <point x="119" y="694" type="line"/>
+      <point x="113" y="676" type="line"/>
+      <point x="498" y="676" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="113" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_acute.glif b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
index a00c4f27..cb0fd35d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_breve.glif b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
index 9926182d..7830f081 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="100"/>
+    <component base="brevecomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_caron.glif b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
index 78af5e57..8402a3c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="128"/>
+    <component base="caroncomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
index 82276a84..b04fa77e 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="179"/>
-    <component base="brevecomb.case" xOffset="100"/>
+    <component base="cedillacomb" xOffset="173"/>
+    <component base="brevecomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
index 1b8b3ea5..33d49ec5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="126"/>
+    <component base="circumflexcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index bb7613f1..f051188b 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="180" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="174" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
index 5a042efd..ca143cd8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="184"/>
-    <component base="circumflexcomb.case" xOffset="126"/>
+    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="circumflexcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index cd74e7ea..88db55df 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="180" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="174" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
index 2379586d..18a5d574 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="180" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="174" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
index 2c2a5a8c..a8a681f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="138" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="132" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
index f706b20c..1099193c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="60"/>
+    <component base="dblgravecomb.case" xOffset="54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
index 884ea099..4298f314 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="83"/>
+    <component base="dieresiscomb.case" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
index c018ba6a..098f9be1 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="184"/>
+    <component base="dotaccentcomb.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
index f952513b..6d31d069 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="184"/>
+    <component base="dotbelowcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_grave.glif b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
index 13ca2dc4..d051c0d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="106"/>
+    <component base="gravecomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
index 57024a3e..2d7e39d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="148"/>
+    <component base="hookabovecomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
index 1d72cffd..de4ae2b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="97"/>
+    <component base="breveinvertedcomb.case" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macron.glif b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
index ceabb84a..9253c199 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
+    <component base="macroncomb.case" xOffset="59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
index 1ec4979c..421a343f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
-    <component base="acutecomb.case" xOffset="245" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="59"/>
+    <component base="acutecomb.case" xOffset="239" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
index 8834ef86..90ac7d74 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="65"/>
-    <component base="gravecomb.case" xOffset="106" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="59"/>
+    <component base="gravecomb.case" xOffset="100" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
index b2347d75..4493236d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0118"/>
   <anchor x="285" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="97"/>
+    <component base="ogonekcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
index 8caa7f02..380e56ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="572"/>
+  <advance width="566"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
index 1c027d47..a4dd0c8c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="0421"/>
   <anchor x="371" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
index 134deaf5..686df78f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="646"/>
+  <advance width="640"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
index 35b1235c..bcc1eb9a 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="59"/>
+    <component base="tildecomb.case" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index 1c7e9589..e00b310f 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="541"/>
+  <advance width="535"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="270" y="0" name="bottom"/>
-  <anchor x="270" y="694" name="top"/>
+  <anchor x="264" y="0" name="bottom"/>
+  <anchor x="264" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="132" y="0" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="366" type="line"/>
-      <point x="473" y="366" type="line"/>
-      <point x="473" y="384" type="line"/>
-      <point x="119" y="384" type="line"/>
+      <point x="113" y="366" type="line"/>
+      <point x="467" y="366" type="line"/>
+      <point x="467" y="384" type="line"/>
+      <point x="113" y="384" type="line"/>
     </contour>
     <contour>
-      <point x="119" y="676" type="line"/>
-      <point x="497" y="676" type="line"/>
-      <point x="497" y="694" type="line"/>
-      <point x="119" y="694" type="line"/>
+      <point x="113" y="676" type="line"/>
+      <point x="491" y="676" type="line"/>
+      <point x="491" y="694" type="line"/>
+      <point x="113" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_.glif b/src/Cantarell-Light.ufo/glyphs/G_.glif
index 068c7243..dd1e03e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="351" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="344" y="0" name="bottom"/>
+  <anchor x="362" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="397" y="-10" type="curve" smooth="yes"/>
-      <point x="486" y="-10"/>
-      <point x="583" y="19"/>
-      <point x="640" y="60" type="curve"/>
-      <point x="640" y="338" type="line"/>
-      <point x="383" y="338" type="line"/>
-      <point x="383" y="319" type="line"/>
-      <point x="618" y="319" type="line"/>
-      <point x="618" y="57" type="line"/>
-      <point x="623" y="69" type="line"/>
-      <point x="560" y="32"/>
-      <point x="473" y="9"/>
-      <point x="400" y="9" type="curve" smooth="yes"/>
-      <point x="215" y="9"/>
-      <point x="94" y="143"/>
-      <point x="94" y="348" type="curve" smooth="yes"/>
-      <point x="94" y="554"/>
-      <point x="216" y="680"/>
-      <point x="413" y="680" type="curve" smooth="yes"/>
-      <point x="482" y="680"/>
-      <point x="555" y="664"/>
-      <point x="605" y="634" type="curve"/>
-      <point x="612" y="651" type="line"/>
-      <point x="558" y="683"/>
-      <point x="489" y="699"/>
-      <point x="416" y="699" type="curve" smooth="yes"/>
-      <point x="203" y="699"/>
-      <point x="71" y="564"/>
-      <point x="71" y="345" type="curve" smooth="yes"/>
-      <point x="71" y="130"/>
-      <point x="200" y="-10"/>
+      <point x="390" y="-10" type="curve" smooth="yes"/>
+      <point x="479" y="-10"/>
+      <point x="576" y="19"/>
+      <point x="633" y="60" type="curve"/>
+      <point x="633" y="338" type="line"/>
+      <point x="376" y="338" type="line"/>
+      <point x="376" y="319" type="line"/>
+      <point x="611" y="319" type="line"/>
+      <point x="611" y="57" type="line"/>
+      <point x="616" y="69" type="line"/>
+      <point x="553" y="32"/>
+      <point x="466" y="9"/>
+      <point x="393" y="9" type="curve" smooth="yes"/>
+      <point x="208" y="9"/>
+      <point x="87" y="143"/>
+      <point x="87" y="348" type="curve" smooth="yes"/>
+      <point x="87" y="554"/>
+      <point x="209" y="680"/>
+      <point x="406" y="680" type="curve" smooth="yes"/>
+      <point x="475" y="680"/>
+      <point x="548" y="664"/>
+      <point x="598" y="634" type="curve"/>
+      <point x="605" y="651" type="line"/>
+      <point x="551" y="683"/>
+      <point x="482" y="699"/>
+      <point x="409" y="699" type="curve" smooth="yes"/>
+      <point x="196" y="699"/>
+      <point x="64" y="564"/>
+      <point x="64" y="345" type="curve" smooth="yes"/>
+      <point x="64" y="130"/>
+      <point x="193" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_breve.glif b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
index 3a23ade9..d2928f67 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="166"/>
+    <component base="brevecomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_caron.glif b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
index 45b5c965..40a794aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="194"/>
+    <component base="caroncomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
index b258e67a..d8e30c4f 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="192"/>
+    <component base="circumflexcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
index 6d2c967a..8aa3a1f9 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="222"/>
+    <component base="commaaccentcomb" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
index 9d7c0c0c..840c0934 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="250"/>
+    <component base="dotaccentcomb.case" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_macron.glif b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
index 2768883d..d8d9d96c 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="716"/>
+  <advance width="709"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="131"/>
+    <component base="macroncomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
index 405bcbb1..be4f2b32 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0415"/>
   <anchor x="277" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
index 1b3ac075..c373e550 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
index 8fe78829..8ea85a1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
index ed380e35..b11df06b 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="553"/>
+  <advance width="547"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_.glif b/src/Cantarell-Light.ufo/glyphs/K_.glif
index 3b2b45fa..be3221eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_.glif
@@ -1,27 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="552"/>
+  <advance width="546"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="694" name="top"/>
+  <anchor x="277" y="0" name="bottom"/>
+  <anchor x="277" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="497" y="0" type="line"/>
-      <point x="527" y="0" type="line"/>
-      <point x="151" y="366" type="line"/>
-      <point x="151" y="356" type="line"/>
-      <point x="513" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="132" y="360" type="line"/>
+      <point x="491" y="0" type="line"/>
+      <point x="521" y="0" type="line"/>
+      <point x="145" y="366" type="line"/>
+      <point x="145" y="356" type="line"/>
+      <point x="507" y="694" type="line"/>
+      <point x="478" y="694" type="line"/>
+      <point x="126" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_acute.glif b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
index edf5f080..614f39cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="552"/>
+  <advance width="546"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="225"/>
+    <component base="acutecomb.case" xOffset="219"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
index 7264f0f6..ea0a6362 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="552"/>
+  <advance width="546"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="154"/>
+    <component base="commaaccentcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_.glif b/src/Cantarell-Light.ufo/glyphs/L_.glif
index 2244dc3f..334960be 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="286" y="0" name="bottom"/>
-  <anchor x="162" y="367" name="center"/>
-  <anchor x="502" y="352" name="periodcentered"/>
-  <anchor x="122" y="694" name="top"/>
-  <anchor x="251" y="480" name="topright"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="156" y="367" name="center"/>
+  <anchor x="496" y="352" name="periodcentered"/>
+  <anchor x="116" y="694" name="top"/>
+  <anchor x="245" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="456" y="0" type="line"/>
-      <point x="456" y="19" type="line"/>
-      <point x="131" y="19" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="450" y="0" type="line"/>
+      <point x="450" y="19" type="line"/>
+      <point x="125" y="19" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_J_.glif b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
index 95e758ea..369147f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="893"/>
+  <advance width="887"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="495"/>
+    <component base="J" xOffset="489"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_acute.glif b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
index 58a394a4..084479b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="64"/>
+    <component base="acutecomb.case" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_caron.glif b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
index 2cac9d1f..a78e5fba 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="139"/>
+    <component base="caroncomb.alt" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
index 7a34cea7..923cf229 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="157"/>
+    <component base="commaaccentcomb" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dot.glif b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
index 9c25d0f6..3b87ebca 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="502"/>
+    <component base="periodcentered.loclCAT.case" xOffset="496"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
index b7c784e1..35da9fa4 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_j.glif b/src/Cantarell-Light.ufo/glyphs/L_j.glif
index 99c51e41..bf75897e 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="697"/>
+  <advance width="691"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="495"/>
+    <component base="j" xOffset="489"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
index 6033a396..fdf0a81f 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="36"/>
+    <component base="macronbelowcomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_slash.glif b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
index 99c43bf3..3cb72b56 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="495"/>
+  <advance width="489"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-14" yOffset="61"/>
+    <component base="slashshortcomb.case" xOffset="-20" yOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index 67ba99b2..c27aed32 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="572"/>
+  <advance width="566"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="312" y="0" name="bottom"/>
+  <anchor x="312" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="268" type="line"/>
-      <point x="286" y="268" type="line" smooth="yes"/>
-      <point x="422" y="268"/>
-      <point x="512" y="353"/>
-      <point x="512" y="480" type="curve" smooth="yes"/>
-      <point x="512" y="608"/>
-      <point x="424" y="694"/>
-      <point x="292" y="694" type="curve" smooth="yes"/>
-      <point x="125" y="694" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="286" y="676" type="line" smooth="yes"/>
-      <point x="408" y="676"/>
-      <point x="490" y="597"/>
-      <point x="490" y="475" type="curve" smooth="yes"/>
-      <point x="490" y="358"/>
-      <point x="416" y="286"/>
-      <point x="292" y="286" type="curve" smooth="yes"/>
-      <point x="125" y="286" type="line"/>
+      <point x="119" y="268" type="line"/>
+      <point x="280" y="268" type="line" smooth="yes"/>
+      <point x="416" y="268"/>
+      <point x="506" y="353"/>
+      <point x="506" y="480" type="curve" smooth="yes"/>
+      <point x="506" y="608"/>
+      <point x="418" y="694"/>
+      <point x="286" y="694" type="curve" smooth="yes"/>
+      <point x="119" y="694" type="line"/>
+      <point x="119" y="676" type="line"/>
+      <point x="280" y="676" type="line" smooth="yes"/>
+      <point x="402" y="676"/>
+      <point x="484" y="597"/>
+      <point x="484" y="475" type="curve" smooth="yes"/>
+      <point x="484" y="358"/>
+      <point x="410" y="286"/>
+      <point x="286" y="286" type="curve" smooth="yes"/>
+      <point x="119" y="286" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_.glif b/src/Cantarell-Light.ufo/glyphs/Q_.glif
index db626580..0b09116f 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="754"/>
+  <advance width="747"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
+  <anchor x="370" y="0" name="bottom"/>
+  <anchor x="370" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="376" y="-10" type="curve" smooth="yes"/>
-      <point x="559" y="-10"/>
-      <point x="682" y="135"/>
-      <point x="682" y="346" type="curve" smooth="yes"/>
-      <point x="682" y="558"/>
-      <point x="561" y="699"/>
-      <point x="379" y="699" type="curve" smooth="yes"/>
-      <point x="194" y="699"/>
-      <point x="71" y="553"/>
-      <point x="71" y="343" type="curve" smooth="yes"/>
-      <point x="71" y="133"/>
-      <point x="193" y="-10"/>
+      <point x="369" y="-10" type="curve" smooth="yes"/>
+      <point x="552" y="-10"/>
+      <point x="675" y="135"/>
+      <point x="675" y="346" type="curve" smooth="yes"/>
+      <point x="675" y="558"/>
+      <point x="554" y="699"/>
+      <point x="372" y="699" type="curve" smooth="yes"/>
+      <point x="187" y="699"/>
+      <point x="64" y="553"/>
+      <point x="64" y="343" type="curve" smooth="yes"/>
+      <point x="64" y="133"/>
+      <point x="186" y="-10"/>
     </contour>
     <contour>
-      <point x="378" y="9" type="curve" smooth="yes"/>
-      <point x="207" y="9"/>
-      <point x="93" y="147"/>
-      <point x="93" y="346" type="curve" smooth="yes"/>
-      <point x="93" y="545"/>
-      <point x="206" y="680"/>
-      <point x="376" y="680" type="curve" smooth="yes"/>
-      <point x="546" y="680"/>
-      <point x="660" y="542"/>
-      <point x="660" y="343" type="curve" smooth="yes"/>
-      <point x="660" y="143"/>
-      <point x="548" y="9"/>
+      <point x="371" y="9" type="curve" smooth="yes"/>
+      <point x="200" y="9"/>
+      <point x="86" y="147"/>
+      <point x="86" y="346" type="curve" smooth="yes"/>
+      <point x="86" y="545"/>
+      <point x="199" y="680"/>
+      <point x="369" y="680" type="curve" smooth="yes"/>
+      <point x="539" y="680"/>
+      <point x="653" y="542"/>
+      <point x="653" y="343" type="curve" smooth="yes"/>
+      <point x="653" y="143"/>
+      <point x="541" y="9"/>
     </contour>
     <contour>
-      <point x="691" y="-13" type="line"/>
-      <point x="704" y="1" type="line"/>
-      <point x="414" y="287" type="line"/>
-      <point x="403" y="274" type="line"/>
+      <point x="684" y="-13" type="line"/>
+      <point x="697" y="1" type="line"/>
+      <point x="407" y="287" type="line"/>
+      <point x="396" y="274" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
index 59f59ccf..0a44622e 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="754"/>
+  <advance width="747"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_.glif b/src/Cantarell-Light.ufo/glyphs/R_.glif
index 18d7b47e..74bf49ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_.glif
@@ -1,44 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="276" y="694" name="top"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="270" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="121" y="311" type="line"/>
-      <point x="283" y="311" type="line" smooth="yes"/>
-      <point x="433" y="311"/>
-      <point x="515" y="381"/>
-      <point x="515" y="506" type="curve" smooth="yes"/>
-      <point x="515" y="628"/>
-      <point x="433" y="694"/>
-      <point x="288" y="694" type="curve" smooth="yes"/>
-      <point x="121" y="694" type="line"/>
-      <point x="121" y="676" type="line"/>
-      <point x="283" y="676" type="line" smooth="yes"/>
-      <point x="419" y="676"/>
-      <point x="493" y="616"/>
-      <point x="493" y="500" type="curve" smooth="yes"/>
-      <point x="493" y="389"/>
-      <point x="423" y="329"/>
-      <point x="290" y="329" type="curve" smooth="yes"/>
-      <point x="121" y="329" type="line"/>
+      <point x="115" y="311" type="line"/>
+      <point x="277" y="311" type="line" smooth="yes"/>
+      <point x="427" y="311"/>
+      <point x="509" y="381"/>
+      <point x="509" y="506" type="curve" smooth="yes"/>
+      <point x="509" y="628"/>
+      <point x="427" y="694"/>
+      <point x="282" y="694" type="curve" smooth="yes"/>
+      <point x="115" y="694" type="line"/>
+      <point x="115" y="676" type="line"/>
+      <point x="277" y="676" type="line" smooth="yes"/>
+      <point x="413" y="676"/>
+      <point x="487" y="616"/>
+      <point x="487" y="500" type="curve" smooth="yes"/>
+      <point x="487" y="389"/>
+      <point x="417" y="329"/>
+      <point x="284" y="329" type="curve" smooth="yes"/>
+      <point x="115" y="329" type="line"/>
     </contour>
     <contour>
-      <point x="531" y="0" type="line"/>
-      <point x="557" y="0" type="line"/>
-      <point x="372" y="325" type="line"/>
-      <point x="349" y="325" type="line"/>
+      <point x="525" y="0" type="line"/>
+      <point x="551" y="0" type="line"/>
+      <point x="366" y="325" type="line"/>
+      <point x="343" y="325" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_acute.glif b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
index 8eca6caf..a2cabbf1 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="218"/>
+    <component base="acutecomb.case" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_caron.glif b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
index 2d522456..32f437d2 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="101"/>
+    <component base="caroncomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
index 8f162c88..6619bcfd 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="175"/>
+    <component base="commaaccentcomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
index 7bc8839d..8a3c61bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="33"/>
+    <component base="dblgravecomb.case" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
index 17c23bab..6adb6cc5 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="184"/>
+    <component base="dotbelowcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
index 3ca8d33e..1ff9f11d 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="70"/>
+    <component base="breveinvertedcomb.case" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
index e09e4375..be28fd90 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="606"/>
+  <advance width="600"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="54"/>
+    <component base="macronbelowcomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
index 8f233e47..494b23be 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="236"/>
+  <advance width="233"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="3" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="15" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_horn.glif b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
index 4b919001..d420529b 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="572"/>
+  <advance width="566"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="131" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="125" y="148" type="line"/>
-      <point x="286" y="148" type="line" smooth="yes"/>
-      <point x="428" y="148"/>
-      <point x="512" y="228"/>
-      <point x="512" y="357" type="curve" smooth="yes"/>
-      <point x="512" y="489"/>
-      <point x="424" y="574"/>
-      <point x="292" y="574" type="curve" smooth="yes"/>
-      <point x="125" y="574" type="line"/>
-      <point x="125" y="556" type="line"/>
-      <point x="286" y="556" type="line" smooth="yes"/>
-      <point x="408" y="556"/>
-      <point x="490" y="477"/>
-      <point x="490" y="355" type="curve" smooth="yes"/>
-      <point x="490" y="238"/>
-      <point x="416" y="166"/>
-      <point x="292" y="166" type="curve" smooth="yes"/>
-      <point x="125" y="166" type="line"/>
+      <point x="119" y="148" type="line"/>
+      <point x="280" y="148" type="line" smooth="yes"/>
+      <point x="422" y="148"/>
+      <point x="506" y="228"/>
+      <point x="506" y="357" type="curve" smooth="yes"/>
+      <point x="506" y="489"/>
+      <point x="418" y="574"/>
+      <point x="286" y="574" type="curve" smooth="yes"/>
+      <point x="119" y="574" type="line"/>
+      <point x="119" y="556" type="line"/>
+      <point x="280" y="556" type="line" smooth="yes"/>
+      <point x="402" y="556"/>
+      <point x="484" y="477"/>
+      <point x="484" y="355" type="curve" smooth="yes"/>
+      <point x="484" y="238"/>
+      <point x="410" y="166"/>
+      <point x="286" y="166" type="curve" smooth="yes"/>
+      <point x="119" y="166" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
index 2c9181a3..dfc203d9 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="619"/>
+  <advance width="613"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/a-cy.glif b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
index fb36db8b..8b873931 100644
--- a/src/Cantarell-Light.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a-cy" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0430"/>
   <anchor x="233" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/a.glif b/src/Cantarell-Light.ufo/glyphs/a.glif
index c90a0b3e..1eff103a 100644
--- a/src/Cantarell-Light.ufo/glyphs/a.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0061"/>
   <note>
 a
@@ -51,4 +51,10 @@ a
       <point x="105" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aacute.glif b/src/Cantarell-Light.ufo/glyphs/aacute.glif
index 5efb99db..0192a182 100644
--- a/src/Cantarell-Light.ufo/glyphs/aacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aacute" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
index 6cea9483..392adbf8 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve-cy" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve.glif b/src/Cantarell-Light.ufo/glyphs/abreve.glif
index 1386eeb2..2752e43a 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0103"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
index 500267a0..9773db2a 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreveacute" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
index 75852a56..7d2741cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevedotbelow" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EB7"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
index c75020a4..8f69fae7 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevegrave" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
index 41c286f5..91c5a3d3 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevehookabove" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
index 79452334..3ef0001d 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevetilde" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acaron.glif b/src/Cantarell-Light.ufo/glyphs/acaron.glif
index cc364718..ca14c954 100644
--- a/src/Cantarell-Light.ufo/glyphs/acaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acaron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acaron" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="01CE"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
index a575aa26..2da780a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflex" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E2"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
index ce31786d..570b4ce4 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexacute" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
index 92e90c15..4f1a8ba4 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexdotbelow" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EAD"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
index 0d1d59ac..3fb814b4 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexgrave" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
index b3f01d26..6e7be76f 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexhookabove" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
index 8264ce99..ca059a8d 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflextilde" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
index 7710a91c..d3032d2f 100644
--- a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adblgrave" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0201"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
index 62cc1669..8ffdf2a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis-cy" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis.glif b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
index ed089aeb..622012a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
index c006cb6f..cc803417 100644
--- a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adotbelow" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EA1"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/agrave.glif b/src/Cantarell-Light.ufo/glyphs/agrave.glif
index 35942bee..248b8096 100644
--- a/src/Cantarell-Light.ufo/glyphs/agrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/agrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="agrave" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E0"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
index d4ef0dfd..4eff1006 100644
--- a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ahookabove" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="1EA3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
index f8919c12..601c9111 100644
--- a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ainvertedbreve" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0203"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/amacron.glif b/src/Cantarell-Light.ufo/glyphs/amacron.glif
index 8aec4530..616ed4de 100644
--- a/src/Cantarell-Light.ufo/glyphs/amacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/amacron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="amacron" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0101"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/aogonek.glif b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
index aa7c5852..d491546b 100644
--- a/src/Cantarell-Light.ufo/glyphs/aogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aogonek" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="0105"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/aring.glif b/src/Cantarell-Light.ufo/glyphs/aring.glif
index 04e6faec..eeab4afc 100644
--- a/src/Cantarell-Light.ufo/glyphs/aring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aring.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aring" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E5"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/aringacute.glif b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
index fd744eb7..22fbe1ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/aringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aringacute" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="01FB"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/atilde.glif b/src/Cantarell-Light.ufo/glyphs/atilde.glif
index fb10455b..ee59bc42 100644
--- a/src/Cantarell-Light.ufo/glyphs/atilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/atilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="atilde" format="2">
-  <advance width="466"/>
+  <advance width="464"/>
   <unicode hex="00E3"/>
   <outline>
     <component base="a"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/b.glif b/src/Cantarell-Light.ufo/glyphs/b.glif
index 25b42c33..e82dc2e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/b.glif
+++ b/src/Cantarell-Light.ufo/glyphs/b.glif
@@ -44,4 +44,12 @@ b
       <point x="187" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/d.glif b/src/Cantarell-Light.ufo/glyphs/d.glif
index d4df06b1..1cf2e86e 100644
--- a/src/Cantarell-Light.ufo/glyphs/d.glif
+++ b/src/Cantarell-Light.ufo/glyphs/d.glif
@@ -46,4 +46,12 @@ d
       <point x="141" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/e.glif b/src/Cantarell-Light.ufo/glyphs/e.glif
index 14633561..2e0d8c86 100644
--- a/src/Cantarell-Light.ufo/glyphs/e.glif
+++ b/src/Cantarell-Light.ufo/glyphs/e.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0065"/>
   <note>
 e
@@ -43,4 +43,12 @@ e
       <point x="145" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eacute.glif b/src/Cantarell-Light.ufo/glyphs/eacute.glif
index fdf5ba0d..e530a805 100644
--- a/src/Cantarell-Light.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ebreve.glif b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
index a76f3463..542d1eff 100644
--- a/src/Cantarell-Light.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecaron.glif b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
index 9597137e..9dfcac2a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
index 82671ddb..a6c83485 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
index da5f72a5..4a58aaab 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
index 2a93c86e..282c863b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
index e2982686..95d7d87e 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
index ece89368..bd542fcc 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
index 8b7ad717..4f4d0dfe 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
index 774bfc0d..731f92a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
index 4b18c68a..4be8c70a 100644
--- a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/edieresis.glif b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
index afedb3f1..017651aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
index 731fa151..c3e5987d 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
index 061a0cf8..245e1df5 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/egrave.glif b/src/Cantarell-Light.ufo/glyphs/egrave.glif
index 82e38adc..114f58a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/egrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
index c66156d7..c5652f65 100644
--- a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
index 5c366dd4..3122627a 100644
--- a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacron.glif b/src/Cantarell-Light.ufo/glyphs/emacron.glif
index 080067da..2d2e0ba9 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
index 23132b80..36b8397f 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
index daf653a3..f3cc078e 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/eogonek.glif b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
index b26769d2..9bb215cc 100644
--- a/src/Cantarell-Light.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/etilde.glif b/src/Cantarell-Light.ufo/glyphs/etilde.glif
index b89e27e9..1f5dafb0 100644
--- a/src/Cantarell-Light.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/g.glif b/src/Cantarell-Light.ufo/glyphs/g.glif
index 1b6d99bf..192e0a7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/g.glif
+++ b/src/Cantarell-Light.ufo/glyphs/g.glif
@@ -56,4 +56,12 @@ g
       <point x="141" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/h.glif b/src/Cantarell-Light.ufo/glyphs/h.glif
index 757b8c21..752ac4fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/h.glif
+++ b/src/Cantarell-Light.ufo/glyphs/h.glif
@@ -34,4 +34,12 @@ h
       <point x="425" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
index 3bcca582..9cf6d147 100644
--- a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0435"/>
   <anchor x="247" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
index a67fd4c8..a1332801 100644
--- a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
index 241dd331..41c947e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/io-cy.glif b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
index ca23dce1..da4dd566 100644
--- a/src/Cantarell-Light.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/k.glif b/src/Cantarell-Light.ufo/glyphs/k.glif
index ee7ee5ef..eab4a729 100644
--- a/src/Cantarell-Light.ufo/glyphs/k.glif
+++ b/src/Cantarell-Light.ufo/glyphs/k.glif
@@ -24,4 +24,10 @@ k
       <point x="110" y="257" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/m.glif b/src/Cantarell-Light.ufo/glyphs/m.glif
index 8c88d59e..968a394e 100644
--- a/src/Cantarell-Light.ufo/glyphs/m.glif
+++ b/src/Cantarell-Light.ufo/glyphs/m.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="m" format="2">
-  <advance width="843"/>
+  <advance width="842"/>
   <unicode hex="006D"/>
   <note>
 m
@@ -52,4 +52,12 @@ m
       <point x="742" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
index 82f4b0da..c9e7d899 100644
--- a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mdotbelow" format="2">
-  <advance width="843"/>
+  <advance width="842"/>
   <unicode hex="1E43"/>
   <outline>
     <component base="m"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/p.glif b/src/Cantarell-Light.ufo/glyphs/p.glif
index 37010535..8acb4158 100644
--- a/src/Cantarell-Light.ufo/glyphs/p.glif
+++ b/src/Cantarell-Light.ufo/glyphs/p.glif
@@ -44,4 +44,12 @@ p
       <point x="188" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/q.glif b/src/Cantarell-Light.ufo/glyphs/q.glif
index 5e66adf7..805444ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/q.glif
+++ b/src/Cantarell-Light.ufo/glyphs/q.glif
@@ -44,4 +44,12 @@ q
       <point x="141" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/r.glif b/src/Cantarell-Light.ufo/glyphs/r.glif
index 7a958319..28bd7020 100644
--- a/src/Cantarell-Light.ufo/glyphs/r.glif
+++ b/src/Cantarell-Light.ufo/glyphs/r.glif
@@ -32,4 +32,10 @@ r
       <point x="101" y="388" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
index 6614ef80..05513762 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa.glif b/src/Cantarell-Light.ufo/glyphs/schwa.glif
index 7013e79b..f23e4804 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="493"/>
+  <advance width="503"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="493" yOffset="480"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="503" yOffset="480"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/u.glif b/src/Cantarell-Light.ufo/glyphs/u.glif
index 6f0a678b..c1e56c65 100644
--- a/src/Cantarell-Light.ufo/glyphs/u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0075"/>
   <note>
 u
 </note>
-  <anchor x="249" y="0" name="bottom"/>
-  <anchor x="424" y="10" name="ogonek"/>
-  <anchor x="249" y="480" name="top"/>
-  <anchor x="490" y="480" name="topright"/>
+  <anchor x="248" y="0" name="bottom"/>
+  <anchor x="423" y="10" name="ogonek"/>
+  <anchor x="248" y="480" name="top"/>
+  <anchor x="489" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="430" y="480" type="line"/>
-      <point x="409" y="480" type="line"/>
-      <point x="409" y="76" type="line"/>
-      <point x="413" y="0" type="line"/>
-      <point x="430" y="0" type="line"/>
+      <point x="429" y="480" type="line"/>
+      <point x="408" y="480" type="line"/>
+      <point x="408" y="76" type="line"/>
+      <point x="412" y="0" type="line"/>
+      <point x="429" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="480" type="line"/>
-      <point x="80" y="480" type="line"/>
-      <point x="80" y="166" type="line" smooth="yes"/>
-      <point x="80" y="57"/>
-      <point x="143" y="-6"/>
-      <point x="241" y="-6" type="curve" smooth="yes"/>
-      <point x="308" y="-6"/>
-      <point x="378" y="25"/>
-      <point x="427" y="76" type="curve"/>
-      <point x="418" y="87" type="line"/>
-      <point x="372" y="40"/>
-      <point x="306" y="12"/>
-      <point x="245" y="12" type="curve" smooth="yes"/>
-      <point x="156" y="12"/>
-      <point x="101" y="69"/>
-      <point x="101" y="166" type="curve" smooth="yes"/>
+      <point x="100" y="480" type="line"/>
+      <point x="79" y="480" type="line"/>
+      <point x="79" y="166" type="line" smooth="yes"/>
+      <point x="79" y="57"/>
+      <point x="142" y="-6"/>
+      <point x="240" y="-6" type="curve" smooth="yes"/>
+      <point x="307" y="-6"/>
+      <point x="377" y="25"/>
+      <point x="426" y="76" type="curve"/>
+      <point x="417" y="87" type="line"/>
+      <point x="371" y="40"/>
+      <point x="305" y="12"/>
+      <point x="244" y="12" type="curve" smooth="yes"/>
+      <point x="155" y="12"/>
+      <point x="100" y="69"/>
+      <point x="100" y="166" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uacute.glif b/src/Cantarell-Light.ufo/glyphs/uacute.glif
index 0ed674c7..5e9babb3 100644
--- a/src/Cantarell-Light.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="182"/>
+    <component base="acutecomb" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ubreve.glif b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
index 2be22919..25a6ddb2 100644
--- a/src/Cantarell-Light.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="63"/>
+    <component base="brevecomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucaron.glif b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
index b566e7e8..c96c11ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="66"/>
+    <component base="caroncomb" xOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
index 2ba41531..b3b3dc73 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="78"/>
+    <component base="circumflexcomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
index a5a46e23..91f7914e 100644
--- a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="-3"/>
+    <component base="dblgravecomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis.glif b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
index 96112fdb..db59efd4 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="30"/>
+    <component base="dieresiscomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
index 79808769..1445dfaa 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="30"/>
+    <component base="dieresiscomb_acutecomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
index e244244b..ec0a88a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="30"/>
+    <component base="dieresiscomb_caroncomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
index 9a3c579f..57c0f22c 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="30"/>
+    <component base="dieresiscomb_gravecomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
index 4ae0447e..1f51be61 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="30"/>
+    <component base="dieresiscomb_macroncomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
index 7677fbb8..45cadc1a 100644
--- a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="129"/>
+    <component base="dotbelowcomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ugrave.glif b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
index fbd43578..8c2cdc8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
index 9dbf6992..93a2ff0f 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="97"/>
+    <component base="hookabovecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorn.glif b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
index 2cea3abb..129b3b0e 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="358" yOffset="-2"/>
+    <component base="horncomb" xOffset="357" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
index bf6ef458..5f87aeb7 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="182"/>
+    <component base="acutecomb" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
index ad6871f5..45f6211f 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="129"/>
+    <component base="dotbelowcomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
index fdc0c1fa..d55453de 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
index fa96dbf7..ab61f31f 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="97"/>
+    <component base="hookabovecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
index 7acef24d..3ebdf9e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="582"/>
+  <advance width="581"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="14"/>
+    <component base="tildecomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
index f42e18ee..a55ef161 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="108"/>
+    <component base="hungarumlautcomb" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
index eb90302d..a3b5e7e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="48"/>
+    <component base="breveinvertedcomb" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron.glif b/src/Cantarell-Light.ufo/glyphs/umacron.glif
index e063b8a4..d5ba6c1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="6"/>
+    <component base="macroncomb" xOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
index 4bdb97df..420d04e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-14"/>
+    <component base="macroncomb_dieresiscomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uogonek.glif b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
index 370d3b58..a2b2bcb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="23"/>
+    <component base="ogonekcomb" xOffset="22"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uring.glif b/src/Cantarell-Light.ufo/glyphs/uring.glif
index f3c8df5e..b3b22263 100644
--- a/src/Cantarell-Light.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="75"/>
+    <component base="ringcomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/utilde.glif b/src/Cantarell-Light.ufo/glyphs/utilde.glif
index 7ad25a48..50d7d2ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="14"/>
+    <component base="tildecomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
index a9999bdf..e2774d75 100644
--- a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="518"/>
+  <advance width="517"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="14"/>
+    <component base="tildecomb_acutecomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/y.glif b/src/Cantarell-Light.ufo/glyphs/y.glif
index ec1091a4..3b0e24c1 100644
--- a/src/Cantarell-Light.ufo/glyphs/y.glif
+++ b/src/Cantarell-Light.ufo/glyphs/y.glif
@@ -25,4 +25,12 @@ y
       <point x="219" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_.glif b/src/Cantarell-Regular.ufo/glyphs/B_.glif
index 3e22b706..187efe94 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_.glif
@@ -1,48 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="640"/>
+  <advance width="636"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="338" y="0" type="line" smooth="yes"/>
-      <point x="498" y="0"/>
-      <point x="592" y="75"/>
-      <point x="592" y="202" type="curve" smooth="yes"/>
-      <point x="592" y="319"/>
-      <point x="504" y="396"/>
-      <point x="371" y="396" type="curve" smooth="yes"/>
-      <point x="145" y="396" type="line"/>
-      <point x="145" y="327" type="line"/>
-      <point x="362" y="327" type="line" smooth="yes"/>
-      <point x="450" y="327"/>
-      <point x="507" y="271"/>
-      <point x="507" y="185" type="curve" smooth="yes"/>
-      <point x="507" y="105"/>
-      <point x="459" y="71"/>
-      <point x="348" y="71" type="curve" smooth="yes"/>
-      <point x="179" y="71" type="line"/>
-      <point x="179" y="623" type="line"/>
-      <point x="297" y="623" type="line" smooth="yes"/>
-      <point x="403" y="623"/>
-      <point x="455" y="584"/>
-      <point x="455" y="505" type="curve" smooth="yes"/>
-      <point x="455" y="444"/>
-      <point x="421" y="409"/>
-      <point x="329" y="375" type="curve"/>
-      <point x="449" y="375" type="line"/>
-      <point x="504" y="399"/>
-      <point x="540" y="460"/>
-      <point x="540" y="527" type="curve" smooth="yes"/>
-      <point x="540" y="633"/>
-      <point x="455" y="694"/>
-      <point x="307" y="694" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="334" y="0" type="line" smooth="yes"/>
+      <point x="494" y="0"/>
+      <point x="588" y="75"/>
+      <point x="588" y="202" type="curve" smooth="yes"/>
+      <point x="588" y="319"/>
+      <point x="500" y="396"/>
+      <point x="367" y="396" type="curve" smooth="yes"/>
+      <point x="141" y="396" type="line"/>
+      <point x="141" y="327" type="line"/>
+      <point x="358" y="327" type="line" smooth="yes"/>
+      <point x="446" y="327"/>
+      <point x="503" y="271"/>
+      <point x="503" y="185" type="curve" smooth="yes"/>
+      <point x="503" y="105"/>
+      <point x="455" y="71"/>
+      <point x="344" y="71" type="curve" smooth="yes"/>
+      <point x="175" y="71" type="line"/>
+      <point x="175" y="623" type="line"/>
+      <point x="293" y="623" type="line" smooth="yes"/>
+      <point x="399" y="623"/>
+      <point x="451" y="584"/>
+      <point x="451" y="505" type="curve" smooth="yes"/>
+      <point x="451" y="444"/>
+      <point x="417" y="409"/>
+      <point x="325" y="375" type="curve"/>
+      <point x="445" y="375" type="line"/>
+      <point x="500" y="399"/>
+      <point x="536" y="460"/>
+      <point x="536" y="527" type="curve" smooth="yes"/>
+      <point x="536" y="633"/>
+      <point x="451" y="694"/>
+      <point x="303" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_.glif b/src/Cantarell-Regular.ufo/glyphs/C_.glif
index 2c09d65c..882a9471 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_.glif
@@ -1,40 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="369" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="367" y="0" name="bottom"/>
+  <anchor x="367" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="398" y="-10" type="curve" smooth="yes"/>
-      <point x="465" y="-10"/>
-      <point x="535" y="5"/>
-      <point x="601" y="34" type="curve"/>
-      <point x="582" y="95" type="line"/>
-      <point x="532" y="75"/>
-      <point x="470" y="63"/>
-      <point x="417" y="63" type="curve" smooth="yes"/>
-      <point x="251" y="63"/>
-      <point x="141" y="181"/>
-      <point x="141" y="358" type="curve" smooth="yes"/>
-      <point x="141" y="527"/>
-      <point x="242" y="630"/>
-      <point x="409" y="630" type="curve" smooth="yes"/>
-      <point x="465" y="630"/>
-      <point x="528" y="618"/>
-      <point x="581" y="598" type="curve"/>
-      <point x="605" y="660" type="line"/>
-      <point x="554" y="687"/>
-      <point x="482" y="703"/>
-      <point x="414" y="703" type="curve" smooth="yes"/>
-      <point x="199" y="703"/>
-      <point x="56" y="557"/>
-      <point x="56" y="339" type="curve" smooth="yes"/>
-      <point x="56" y="130"/>
-      <point x="193" y="-10"/>
+      <point x="396" y="-10" type="curve" smooth="yes"/>
+      <point x="463" y="-10"/>
+      <point x="533" y="5"/>
+      <point x="599" y="34" type="curve"/>
+      <point x="580" y="95" type="line"/>
+      <point x="530" y="75"/>
+      <point x="468" y="63"/>
+      <point x="415" y="63" type="curve" smooth="yes"/>
+      <point x="249" y="63"/>
+      <point x="139" y="181"/>
+      <point x="139" y="358" type="curve" smooth="yes"/>
+      <point x="139" y="527"/>
+      <point x="240" y="630"/>
+      <point x="407" y="630" type="curve" smooth="yes"/>
+      <point x="463" y="630"/>
+      <point x="526" y="618"/>
+      <point x="579" y="598" type="curve"/>
+      <point x="603" y="660" type="line"/>
+      <point x="552" y="687"/>
+      <point x="480" y="703"/>
+      <point x="412" y="703" type="curve" smooth="yes"/>
+      <point x="197" y="703"/>
+      <point x="54" y="557"/>
+      <point x="54" y="339" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="191" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
index 65478cce..dca8b9e9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="281"/>
+    <component base="acutecomb.case" xOffset="279"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
index 94239f3b..ec978f9e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="185"/>
+    <component base="caroncomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
index dd587a67..9bcacec0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="222"/>
+    <component base="cedillacomb" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
index 6c867dee..d9c47e42 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="222"/>
-    <component base="acutecomb.case" xOffset="281"/>
+    <component base="cedillacomb" xOffset="220"/>
+    <component base="acutecomb.case" xOffset="279"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
index d761a8ab..a21ca8c2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <component base="circumflexcomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
index 97982ec8..b5576d36 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="233"/>
+    <component base="dotaccentcomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_.glif b/src/Cantarell-Regular.ufo/glyphs/E_.glif
index f055a150..e62aa392 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="305" y="0" name="bottom"/>
-  <anchor x="510" y="10" name="ogonek"/>
-  <anchor x="325" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
+  <anchor x="301" y="0" name="bottom"/>
+  <anchor x="506" y="10" name="ogonek"/>
+  <anchor x="321" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="0" type="line"/>
-      <point x="532" y="0" type="line"/>
-      <point x="532" y="72" type="line"/>
-      <point x="136" y="72" type="line"/>
+      <point x="132" y="0" type="line"/>
+      <point x="528" y="0" type="line"/>
+      <point x="528" y="72" type="line"/>
+      <point x="132" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="323" type="line"/>
-      <point x="505" y="323" type="line"/>
-      <point x="505" y="395" type="line"/>
-      <point x="136" y="395" type="line"/>
+      <point x="132" y="323" type="line"/>
+      <point x="501" y="323" type="line"/>
+      <point x="501" y="395" type="line"/>
+      <point x="132" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="136" y="622" type="line"/>
-      <point x="532" y="622" type="line"/>
-      <point x="532" y="694" type="line"/>
-      <point x="136" y="694" type="line"/>
+      <point x="132" y="622" type="line"/>
+      <point x="528" y="622" type="line"/>
+      <point x="528" y="694" type="line"/>
+      <point x="132" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
index 1e3aecf1..848be161 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="237"/>
+    <component base="acutecomb.case" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
index 315224d4..3aeb061f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="116"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
index 4cd36df9..de41b7a7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="141"/>
+    <component base="caroncomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
index 7e56c2f9..299d157e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="158"/>
-    <component base="brevecomb.case" xOffset="116"/>
+    <component base="cedillacomb" xOffset="154"/>
+    <component base="brevecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
index b549a184..0fd1c159 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="137"/>
+    <component base="circumflexcomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
index c409413e..c83e1e26 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="189" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
index 7e818404..6b6382ef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="169"/>
-    <component base="circumflexcomb.case" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="165"/>
+    <component base="circumflexcomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
index 5c749e33..2b48ff15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="189" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
index 72bcc4cd..c82f795f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="193" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="189" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
index b6d99469..5e6be428 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="160" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="156" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
index e833a285..451e1f51 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="104"/>
+    <component base="dblgravecomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
index 6b4080f6..57bdc70f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="89"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
index 16e8086f..34fe8b21 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="189"/>
+    <component base="dotaccentcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
index 15a76f8e..fb903b18 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="169"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
index 12b255ba..6736e774 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="130"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
index 0a3a3492..fd4ab248 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="181"/>
+    <component base="hookabovecomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
index 10f7347f..f68ea591 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="128"/>
+    <component base="breveinvertedcomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
index 862ae538..91f651ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
+    <component base="macroncomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
index f57d957d..25b6ce09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
-    <component base="acutecomb.case" xOffset="237" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="79"/>
+    <component base="acutecomb.case" xOffset="233" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
index f0ea39d8..c576af7f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="83"/>
-    <component base="gravecomb.case" xOffset="130" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="79"/>
+    <component base="gravecomb.case" xOffset="126" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
index 989bdc42..74da354b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="78"/>
+    <component base="ogonekcomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
index 13eb601e..0a0ad974 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="602"/>
+  <advance width="598"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
index ce9e21b8..860c392b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="0421"/>
   <anchor x="380" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
index fd868e08..1aa5b7b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="645"/>
+  <advance width="643"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
index 0155b898..f68509a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="85"/>
+    <component base="tildecomb.case" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_.glif b/src/Cantarell-Regular.ufo/glyphs/F_.glif
index a44822e0..96c18cb1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="566"/>
+  <advance width="562"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="263" y="0" name="bottom"/>
-  <anchor x="263" y="694" name="top"/>
+  <anchor x="259" y="0" name="bottom"/>
+  <anchor x="259" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="322" type="line"/>
-      <point x="498" y="322" type="line"/>
-      <point x="498" y="394" type="line"/>
-      <point x="128" y="394" type="line"/>
+      <point x="124" y="322" type="line"/>
+      <point x="494" y="322" type="line"/>
+      <point x="494" y="394" type="line"/>
+      <point x="124" y="394" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="622" type="line"/>
-      <point x="527" y="622" type="line"/>
-      <point x="527" y="694" type="line"/>
-      <point x="128" y="694" type="line"/>
+      <point x="124" y="622" type="line"/>
+      <point x="523" y="622" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="124" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_.glif b/src/Cantarell-Regular.ufo/glyphs/G_.glif
index 30bd1458..a442d165 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_.glif
@@ -1,45 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="395" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
+  <anchor x="393" y="0" name="bottom"/>
+  <anchor x="393" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="404" y="-9" type="curve" smooth="yes"/>
-      <point x="500" y="-9"/>
-      <point x="587" y="19"/>
-      <point x="657" y="74" type="curve"/>
-      <point x="657" y="368" type="line"/>
-      <point x="377" y="368" type="line"/>
-      <point x="377" y="296" type="line"/>
-      <point x="574" y="296" type="line"/>
-      <point x="574" y="71" type="line"/>
-      <point x="593" y="112" type="line"/>
-      <point x="539" y="81"/>
-      <point x="478" y="64"/>
-      <point x="416" y="64" type="curve" smooth="yes"/>
-      <point x="249" y="64"/>
-      <point x="141" y="179"/>
-      <point x="141" y="357" type="curve" smooth="yes"/>
-      <point x="141" y="530"/>
-      <point x="240" y="630"/>
-      <point x="409" y="630" type="curve" smooth="yes"/>
-      <point x="472" y="630"/>
-      <point x="545" y="616"/>
-      <point x="606" y="593" type="curve"/>
-      <point x="630" y="657" type="line"/>
-      <point x="569" y="687"/>
-      <point x="496" y="703"/>
-      <point x="420" y="703" type="curve" smooth="yes"/>
-      <point x="201" y="703"/>
-      <point x="56" y="560"/>
-      <point x="56" y="342" type="curve" smooth="yes"/>
-      <point x="56" y="130"/>
-      <point x="194" y="-9"/>
+      <point x="402" y="-9" type="curve" smooth="yes"/>
+      <point x="498" y="-9"/>
+      <point x="585" y="19"/>
+      <point x="655" y="74" type="curve"/>
+      <point x="655" y="368" type="line"/>
+      <point x="375" y="368" type="line"/>
+      <point x="375" y="296" type="line"/>
+      <point x="572" y="296" type="line"/>
+      <point x="572" y="71" type="line"/>
+      <point x="591" y="112" type="line"/>
+      <point x="537" y="81"/>
+      <point x="476" y="64"/>
+      <point x="414" y="64" type="curve" smooth="yes"/>
+      <point x="247" y="64"/>
+      <point x="139" y="179"/>
+      <point x="139" y="357" type="curve" smooth="yes"/>
+      <point x="139" y="530"/>
+      <point x="238" y="630"/>
+      <point x="407" y="630" type="curve" smooth="yes"/>
+      <point x="470" y="630"/>
+      <point x="543" y="616"/>
+      <point x="604" y="593" type="curve"/>
+      <point x="628" y="657" type="line"/>
+      <point x="567" y="687"/>
+      <point x="494" y="703"/>
+      <point x="418" y="703" type="curve" smooth="yes"/>
+      <point x="199" y="703"/>
+      <point x="54" y="560"/>
+      <point x="54" y="342" type="curve" smooth="yes"/>
+      <point x="54" y="130"/>
+      <point x="192" y="-9"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
index 3c5225ed..2e21ab2b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="186"/>
+    <component base="brevecomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
index 6183a5c5..4a8deb22 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="211"/>
+    <component base="caroncomb.case" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
index 89b266c0..137ae98b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="207"/>
+    <component base="circumflexcomb.case" xOffset="205"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
index c09309ec..846de5a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="229"/>
+    <component base="commaaccentcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
index 13ecfd97..9e1e04b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="259"/>
+    <component base="dotaccentcomb.case" xOffset="257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
index 1961e11b..47036250 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="722"/>
+  <advance width="720"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="153"/>
+    <component base="macroncomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 0d803ed8..4043891d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0415"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
index 6db7b418..b95edf64 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
index 1f296154..422d0a7e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
index 283e29d5..9286600d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="584"/>
+  <advance width="580"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_.glif b/src/Cantarell-Regular.ufo/glyphs/K_.glif
index 94d15dff..6b47d4ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_.glif
@@ -1,27 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="622"/>
+  <advance width="618"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="314" y="0" name="bottom"/>
-  <anchor x="314" y="694" name="top"/>
+  <anchor x="310" y="0" name="bottom"/>
+  <anchor x="310" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="498" y="0" type="line"/>
-      <point x="607" y="0" type="line"/>
-      <point x="264" y="380" type="line"/>
-      <point x="268" y="357" type="line"/>
-      <point x="594" y="694" type="line"/>
-      <point x="492" y="694" type="line"/>
-      <point x="176" y="361" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="603" y="0" type="line"/>
+      <point x="260" y="380" type="line"/>
+      <point x="264" y="357" type="line"/>
+      <point x="590" y="694" type="line"/>
+      <point x="488" y="694" type="line"/>
+      <point x="172" y="361" type="line"/>
     </contour>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
index df16babb..fadf981d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="622"/>
+  <advance width="618"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="226"/>
+    <component base="acutecomb.case" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
index a0b7ddb4..3d48cde2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="622"/>
+  <advance width="618"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="148"/>
+    <component base="commaaccentcomb" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_.glif b/src/Cantarell-Regular.ufo/glyphs/L_.glif
index 2f4d9bdd..4d8d2247 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_.glif
@@ -1,23 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="294" y="0" name="bottom"/>
-  <anchor x="164" y="347" name="center"/>
-  <anchor x="535" y="352" name="periodcentered"/>
-  <anchor x="139" y="694" name="top"/>
-  <anchor x="303" y="482" name="topright"/>
+  <anchor x="290" y="0" name="bottom"/>
+  <anchor x="160" y="347" name="center"/>
+  <anchor x="531" y="352" name="periodcentered"/>
+  <anchor x="135" y="694" name="top"/>
+  <anchor x="299" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="490" y="0" type="line"/>
-      <point x="490" y="74" type="line"/>
-      <point x="179" y="74" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="486" y="0" type="line"/>
+      <point x="486" y="74" type="line"/>
+      <point x="175" y="74" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index cbbf4412..be7c03c1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="922"/>
+  <advance width="918"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="515"/>
+    <component base="J" xOffset="511"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
index 41739fca..ac844488 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="51"/>
+    <component base="acutecomb.case" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
index 2d827602..2e328d9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="177"/>
+    <component base="caroncomb.alt" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
index c281c5d0..d58f2cbb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="128"/>
+    <component base="commaaccentcomb" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
index e13b3744..fa8a60bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="535"/>
+    <component base="periodcentered.loclCAT.case" xOffset="531"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
index e8e385b9..fa2575a7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_j.glif b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
index 099406d8..146582de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="770"/>
+  <advance width="766"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="515"/>
+    <component base="j" xOffset="511"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
index 419438ea..93130639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="49"/>
+    <component base="macronbelowcomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
index bf989786..ff0cdeab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="515"/>
+  <advance width="511"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-17" yOffset="65"/>
+    <component base="slashshortcomb.case" xOffset="-21" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_.glif b/src/Cantarell-Regular.ufo/glyphs/P_.glif
index a6471a37..847a163a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_.glif
@@ -1,38 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="602"/>
+  <advance width="598"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="297" y="0" name="bottom"/>
-  <anchor x="297" y="694" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="242" type="line"/>
-      <point x="297" y="242" type="line" smooth="yes"/>
-      <point x="452" y="242"/>
-      <point x="556" y="334"/>
-      <point x="556" y="473" type="curve" smooth="yes"/>
-      <point x="556" y="606"/>
-      <point x="458" y="694"/>
-      <point x="312" y="694" type="curve" smooth="yes"/>
-      <point x="149" y="694" type="line"/>
-      <point x="149" y="622" type="line"/>
-      <point x="302" y="622" type="line" smooth="yes"/>
-      <point x="403" y="622"/>
-      <point x="471" y="556"/>
-      <point x="471" y="458" type="curve" smooth="yes"/>
-      <point x="471" y="364"/>
-      <point x="415" y="314"/>
-      <point x="312" y="314" type="curve" smooth="yes"/>
-      <point x="149" y="314" type="line"/>
+      <point x="145" y="242" type="line"/>
+      <point x="293" y="242" type="line" smooth="yes"/>
+      <point x="448" y="242"/>
+      <point x="552" y="334"/>
+      <point x="552" y="473" type="curve" smooth="yes"/>
+      <point x="552" y="606"/>
+      <point x="454" y="694"/>
+      <point x="308" y="694" type="curve" smooth="yes"/>
+      <point x="145" y="694" type="line"/>
+      <point x="145" y="622" type="line"/>
+      <point x="298" y="622" type="line" smooth="yes"/>
+      <point x="399" y="622"/>
+      <point x="467" y="556"/>
+      <point x="467" y="458" type="curve" smooth="yes"/>
+      <point x="467" y="364"/>
+      <point x="411" y="314"/>
+      <point x="308" y="314" type="curve" smooth="yes"/>
+      <point x="145" y="314" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_.glif b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
index cdd059b0..d7919b98 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
@@ -1,46 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="779"/>
+  <advance width="776"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="383" y="0" name="bottom"/>
-  <anchor x="383" y="694" name="top"/>
+  <anchor x="380" y="0" name="bottom"/>
+  <anchor x="380" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="375" y="-7" type="curve" smooth="yes"/>
-      <point x="575" y="-7"/>
-      <point x="709" y="138"/>
-      <point x="709" y="356" type="curve" smooth="yes"/>
-      <point x="709" y="564"/>
-      <point x="579" y="703"/>
-      <point x="385" y="703" type="curve" smooth="yes"/>
-      <point x="188" y="703"/>
-      <point x="57" y="559"/>
-      <point x="57" y="344" type="curve" smooth="yes"/>
-      <point x="57" y="133"/>
-      <point x="184" y="-7"/>
+      <point x="372" y="-7" type="curve" smooth="yes"/>
+      <point x="572" y="-7"/>
+      <point x="706" y="138"/>
+      <point x="706" y="356" type="curve" smooth="yes"/>
+      <point x="706" y="564"/>
+      <point x="576" y="703"/>
+      <point x="382" y="703" type="curve" smooth="yes"/>
+      <point x="185" y="703"/>
+      <point x="54" y="559"/>
+      <point x="54" y="344" type="curve" smooth="yes"/>
+      <point x="54" y="133"/>
+      <point x="181" y="-7"/>
     </contour>
     <contour>
-      <point x="385" y="65" type="curve" smooth="yes"/>
-      <point x="239" y="65"/>
-      <point x="142" y="181"/>
-      <point x="142" y="356" type="curve" smooth="yes"/>
-      <point x="142" y="520"/>
-      <point x="235" y="630"/>
-      <point x="375" y="630" type="curve" smooth="yes"/>
-      <point x="524" y="630"/>
-      <point x="624" y="516"/>
-      <point x="624" y="344" type="curve" smooth="yes"/>
-      <point x="624" y="177"/>
-      <point x="528" y="65"/>
+      <point x="382" y="65" type="curve" smooth="yes"/>
+      <point x="236" y="65"/>
+      <point x="139" y="181"/>
+      <point x="139" y="356" type="curve" smooth="yes"/>
+      <point x="139" y="520"/>
+      <point x="232" y="630"/>
+      <point x="372" y="630" type="curve" smooth="yes"/>
+      <point x="521" y="630"/>
+      <point x="621" y="516"/>
+      <point x="621" y="344" type="curve" smooth="yes"/>
+      <point x="621" y="177"/>
+      <point x="525" y="65"/>
     </contour>
     <contour>
-      <point x="679" y="-32" type="line"/>
-      <point x="728" y="19" type="line"/>
-      <point x="419" y="309" type="line"/>
-      <point x="374" y="259" type="line"/>
+      <point x="676" y="-32" type="line"/>
+      <point x="725" y="19" type="line"/>
+      <point x="416" y="309" type="line"/>
+      <point x="371" y="259" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
index b5fe9c76..db416042 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="779"/>
+  <advance width="776"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_.glif b/src/Cantarell-Regular.ufo/glyphs/R_.glif
index 8290408b..32a560b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_.glif
@@ -1,44 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="313" y="0" name="bottom"/>
-  <anchor x="313" y="694" name="top"/>
+  <anchor x="309" y="0" name="bottom"/>
+  <anchor x="309" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="281" type="line"/>
-      <point x="316" y="281" type="line" smooth="yes"/>
-      <point x="460" y="281"/>
-      <point x="558" y="372"/>
-      <point x="558" y="500" type="curve" smooth="yes"/>
-      <point x="558" y="622"/>
-      <point x="468" y="694"/>
-      <point x="326" y="694" type="curve" smooth="yes"/>
-      <point x="149" y="694" type="line"/>
-      <point x="149" y="622" type="line"/>
-      <point x="316" y="622" type="line" smooth="yes"/>
-      <point x="415" y="622"/>
-      <point x="473" y="571"/>
-      <point x="473" y="485" type="curve" smooth="yes"/>
-      <point x="473" y="400"/>
-      <point x="421" y="351"/>
-      <point x="326" y="351" type="curve" smooth="yes"/>
-      <point x="149" y="351" type="line"/>
+      <point x="145" y="281" type="line"/>
+      <point x="312" y="281" type="line" smooth="yes"/>
+      <point x="456" y="281"/>
+      <point x="554" y="372"/>
+      <point x="554" y="500" type="curve" smooth="yes"/>
+      <point x="554" y="622"/>
+      <point x="464" y="694"/>
+      <point x="322" y="694" type="curve" smooth="yes"/>
+      <point x="145" y="694" type="line"/>
+      <point x="145" y="622" type="line"/>
+      <point x="312" y="622" type="line" smooth="yes"/>
+      <point x="411" y="622"/>
+      <point x="469" y="571"/>
+      <point x="469" y="485" type="curve" smooth="yes"/>
+      <point x="469" y="400"/>
+      <point x="417" y="351"/>
+      <point x="322" y="351" type="curve" smooth="yes"/>
+      <point x="145" y="351" type="line"/>
     </contour>
     <contour>
-      <point x="499" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="406" y="328" type="line"/>
-      <point x="311" y="328" type="line"/>
+      <point x="495" y="0" type="line"/>
+      <point x="594" y="0" type="line"/>
+      <point x="402" y="328" type="line"/>
+      <point x="307" y="328" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
index 7fd6b19c..1557893d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="225"/>
+    <component base="acutecomb.case" xOffset="221"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
index 16e9976f..eec96d86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="129"/>
+    <component base="caroncomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
index cd7c6099..634d966c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="147"/>
+    <component base="commaaccentcomb" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
index 3d963115..649a62b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="92"/>
+    <component base="dblgravecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
index 7c3f7ce1..c0e61742 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="177"/>
+    <component base="dotbelowcomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
index d344b39a..d367ffdf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="116"/>
+    <component base="breveinvertedcomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
index 3bff79ca..fca8ca6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="633"/>
+  <advance width="629"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="68"/>
+    <component base="macronbelowcomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif b/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
index 7b71f549..f373f0e8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_altillo.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="261"/>
+  <advance width="273"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="2" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="-7" yOffset="-808"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>I</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>I</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
index 3718ed8b..e2d1d1ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="602"/>
+  <advance width="598"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="179" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="149" y="139" type="line"/>
-      <point x="302" y="139" type="line" smooth="yes"/>
-      <point x="455" y="139"/>
-      <point x="556" y="229"/>
-      <point x="556" y="365" type="curve" smooth="yes"/>
-      <point x="556" y="499"/>
-      <point x="457" y="591"/>
-      <point x="312" y="591" type="curve" smooth="yes"/>
-      <point x="149" y="591" type="line"/>
-      <point x="149" y="519" type="line"/>
-      <point x="302" y="519" type="line" smooth="yes"/>
-      <point x="406" y="519"/>
-      <point x="471" y="456"/>
-      <point x="471" y="355" type="curve" smooth="yes"/>
-      <point x="471" y="261"/>
-      <point x="415" y="211"/>
-      <point x="312" y="211" type="curve" smooth="yes"/>
-      <point x="149" y="211" type="line"/>
+      <point x="145" y="139" type="line"/>
+      <point x="298" y="139" type="line" smooth="yes"/>
+      <point x="451" y="139"/>
+      <point x="552" y="229"/>
+      <point x="552" y="365" type="curve" smooth="yes"/>
+      <point x="552" y="499"/>
+      <point x="453" y="591"/>
+      <point x="308" y="591" type="curve" smooth="yes"/>
+      <point x="145" y="591" type="line"/>
+      <point x="145" y="519" type="line"/>
+      <point x="298" y="519" type="line" smooth="yes"/>
+      <point x="402" y="519"/>
+      <point x="467" y="456"/>
+      <point x="467" y="355" type="curve" smooth="yes"/>
+      <point x="467" y="261"/>
+      <point x="411" y="211"/>
+      <point x="308" y="211" type="curve" smooth="yes"/>
+      <point x="145" y="211" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
-      <string>P</string>
+      <string>I</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>P</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index c4482295..162ead60 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="640"/>
+  <advance width="636"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/a.glif b/src/Cantarell-Regular.ufo/glyphs/a.glif
index 80c50a99..0e125748 100644
--- a/src/Cantarell-Regular.ufo/glyphs/a.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/a.glif
@@ -51,4 +51,10 @@ a
       <point x="111" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/b.glif b/src/Cantarell-Regular.ufo/glyphs/b.glif
index 1b6b5ce7..c4cb2e38 100644
--- a/src/Cantarell-Regular.ufo/glyphs/b.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/b.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="569"/>
+  <advance width="570"/>
   <unicode hex="0062"/>
   <note>
 b
@@ -44,4 +44,12 @@ b
       <point x="200" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/d.glif b/src/Cantarell-Regular.ufo/glyphs/d.glif
index a0013c39..72f36c88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/d.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/d.glif
@@ -46,4 +46,12 @@ d
       <point x="138" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/e.glif b/src/Cantarell-Regular.ufo/glyphs/e.glif
index 4800611e..64d35862 100644
--- a/src/Cantarell-Regular.ufo/glyphs/e.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/e.glif
@@ -1,46 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0065"/>
   <note>
 e
 </note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="428" y="10" name="ogonek"/>
-  <anchor x="270" y="482" name="top"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="429" y="10" name="ogonek"/>
+  <anchor x="271" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="299" y="-10" type="curve" smooth="yes"/>
-      <point x="354" y="-10"/>
-      <point x="414" y="3"/>
-      <point x="457" y="26" type="curve"/>
-      <point x="439" y="84" type="line"/>
-      <point x="402" y="66"/>
-      <point x="355" y="55"/>
-      <point x="313" y="55" type="curve" smooth="yes"/>
-      <point x="200" y="55"/>
-      <point x="133" y="130"/>
-      <point x="133" y="255" type="curve" smooth="yes"/>
-      <point x="133" y="364"/>
-      <point x="182" y="424"/>
-      <point x="270" y="424" type="curve" smooth="yes"/>
-      <point x="352" y="424"/>
-      <point x="400" y="371"/>
-      <point x="400" y="279" type="curve"/>
-      <point x="119" y="279" type="line"/>
-      <point x="119" y="219" type="line"/>
-      <point x="471" y="219" type="line"/>
-      <point x="473" y="234"/>
-      <point x="475" y="269"/>
-      <point x="475" y="288" type="curve" smooth="yes"/>
-      <point x="475" y="409"/>
-      <point x="395" y="492"/>
-      <point x="276" y="492" type="curve" smooth="yes"/>
-      <point x="142" y="492"/>
-      <point x="51" y="387"/>
-      <point x="51" y="239" type="curve" smooth="yes"/>
-      <point x="51" y="85"/>
-      <point x="146" y="-10"/>
+      <point x="300" y="-10" type="curve" smooth="yes"/>
+      <point x="355" y="-10"/>
+      <point x="415" y="3"/>
+      <point x="458" y="26" type="curve"/>
+      <point x="440" y="84" type="line"/>
+      <point x="403" y="66"/>
+      <point x="356" y="55"/>
+      <point x="314" y="55" type="curve" smooth="yes"/>
+      <point x="201" y="55"/>
+      <point x="134" y="130"/>
+      <point x="134" y="255" type="curve" smooth="yes"/>
+      <point x="134" y="364"/>
+      <point x="183" y="424"/>
+      <point x="271" y="424" type="curve" smooth="yes"/>
+      <point x="353" y="424"/>
+      <point x="401" y="371"/>
+      <point x="401" y="279" type="curve"/>
+      <point x="120" y="279" type="line"/>
+      <point x="120" y="219" type="line"/>
+      <point x="472" y="219" type="line"/>
+      <point x="474" y="234"/>
+      <point x="476" y="269"/>
+      <point x="476" y="288" type="curve" smooth="yes"/>
+      <point x="476" y="409"/>
+      <point x="396" y="492"/>
+      <point x="277" y="492" type="curve" smooth="yes"/>
+      <point x="143" y="492"/>
+      <point x="52" y="387"/>
+      <point x="52" y="239" type="curve" smooth="yes"/>
+      <point x="52" y="85"/>
+      <point x="147" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eacute.glif b/src/Cantarell-Regular.ufo/glyphs/eacute.glif
index 29e3db2d..9ecefd88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acutecomb" xOffset="187"/>
+    <component base="acutecomb" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ebreve.glif b/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
index bca42fe8..b0522a1d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ebreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="brevecomb" xOffset="62"/>
+    <component base="brevecomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecaron.glif b/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
index ce975472..04f3e21b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caroncomb" xOffset="87"/>
+    <component base="caroncomb" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
index 9b674759..0180864a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
-    <component base="cedillacomb" xOffset="138"/>
-    <component base="brevecomb" xOffset="62"/>
+    <component base="cedillacomb" xOffset="139"/>
+    <component base="brevecomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
index d8354208..279f1b6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb" xOffset="77"/>
+    <component base="circumflexcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
index ff11d400..ed931974 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_acutecomb" xOffset="79"/>
+    <component base="circumflexcomb_acutecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
index 701f14fa..7532f664 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="149"/>
-    <component base="circumflexcomb" xOffset="77"/>
+    <component base="dotbelowcomb" xOffset="150"/>
+    <component base="circumflexcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
index 607e73c0..36396c6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_gravecomb" xOffset="79"/>
+    <component base="circumflexcomb_gravecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
index 352535cb..fb95aa10 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="102"/>
+    <component base="circumflexcomb_hookabovecomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
index b5683ce6..cb54af32 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ecircumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb_tildecomb" xOffset="57"/>
+    <component base="circumflexcomb_tildecomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
index 9a1f3522..4d0dc533 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecomb" xOffset="16"/>
+    <component base="dblgravecomb" xOffset="17"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edieresis.glif b/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
index 6ccb8730..a7f26140 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresiscomb" xOffset="37"/>
+    <component base="dieresiscomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
index 2e1dd391..96d423fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccentcomb" xOffset="137"/>
+    <component base="dotaccentcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
index 69748f5a..99b9875e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/edotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/egrave.glif b/src/Cantarell-Regular.ufo/glyphs/egrave.glif
index add976ba..cbfa81b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/egrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="gravecomb" xOffset="92"/>
+    <component base="gravecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
index dec6b570..9598db4c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hookabovecomb" xOffset="117"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
index ad61c976..73954280 100644
--- a/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/einvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvertedcomb" xOffset="60"/>
+    <component base="breveinvertedcomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacron.glif b/src/Cantarell-Regular.ufo/glyphs/emacron.glif
index fb643896..1a3440b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb" xOffset="25"/>
+    <component base="macroncomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
index 1d6db003..904123c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacronacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_acutecomb" xOffset="25"/>
+    <component base="macroncomb_acutecomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
index f6079bd7..d2b34e60 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emacrongrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb_gravecomb" xOffset="25"/>
+    <component base="macroncomb_gravecomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eogonek.glif b/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
index 468e6981..e2434619 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
-    <component base="ogonekcomb.tall" xOffset="-4" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-3" yOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etilde.glif b/src/Cantarell-Regular.ufo/glyphs/etilde.glif
index 2be26c96..e4907bd3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tildecomb" xOffset="38"/>
+    <component base="tildecomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/g.glif b/src/Cantarell-Regular.ufo/glyphs/g.glif
index 78afd46c..3a7afbbc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/g.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/g.glif
@@ -56,4 +56,12 @@ g
       <point x="138" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/h.glif b/src/Cantarell-Regular.ufo/glyphs/h.glif
index 9b3e72ce..42813226 100644
--- a/src/Cantarell-Regular.ufo/glyphs/h.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/h.glif
@@ -34,4 +34,12 @@ h
       <point x="412" y="300" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
index 871cb2a0..12edf0d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0435"/>
   <anchor x="265" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
index c9e93d45..a30920ba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
index 8dbef246..915a9355 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
index 702c79be..9b5758ba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/k.glif b/src/Cantarell-Regular.ufo/glyphs/k.glif
index f459947a..35332d4c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/k.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/k.glif
@@ -24,4 +24,10 @@ k
       <point x="161" y="257" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/m.glif b/src/Cantarell-Regular.ufo/glyphs/m.glif
index e6c60608..59f0c74f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/m.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/m.glif
@@ -52,4 +52,12 @@ m
       <point x="731" y="300" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/p.glif b/src/Cantarell-Regular.ufo/glyphs/p.glif
index 06b65c05..4b732c23 100644
--- a/src/Cantarell-Regular.ufo/glyphs/p.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/p.glif
@@ -44,4 +44,12 @@ p
       <point x="208" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>o</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/q.glif b/src/Cantarell-Regular.ufo/glyphs/q.glif
index 14bed816..b7dbf553 100644
--- a/src/Cantarell-Regular.ufo/glyphs/q.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/q.glif
@@ -44,4 +44,12 @@ q
       <point x="138" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/r.glif b/src/Cantarell-Regular.ufo/glyphs/r.glif
index 8a262ac9..c2e5e3ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/r.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/r.glif
@@ -32,4 +32,10 @@ r
       <point x="145" y="394" type="curve"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
index f0aa5894..86cdf830 100644
--- a/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/schwa.glif b/src/Cantarell-Regular.ufo/glyphs/schwa.glif
index f96bacf2..6412e17e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="527"/>
+  <advance width="528"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="527" yOffset="482"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="528" yOffset="482"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
index a52bc3f4..28570aff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0443"/>
   <anchor x="255" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u.glif b/src/Cantarell-Regular.ufo/glyphs/u.glif
index d0ed59a3..94d43ac0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u.glif
@@ -1,39 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0075"/>
   <note>
 u
 </note>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="452" y="10" name="ogonek"/>
-  <anchor x="273" y="482" name="top"/>
-  <anchor x="531" y="482" name="topright"/>
+  <anchor x="274" y="0" name="bottom"/>
+  <anchor x="453" y="10" name="ogonek"/>
+  <anchor x="274" y="482" name="top"/>
+  <anchor x="532" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="474" y="482" type="line"/>
-      <point x="394" y="482" type="line"/>
-      <point x="394" y="56" type="line"/>
-      <point x="418" y="0" type="line"/>
-      <point x="474" y="0" type="line"/>
+      <point x="475" y="482" type="line"/>
+      <point x="395" y="482" type="line"/>
+      <point x="395" y="56" type="line"/>
+      <point x="419" y="0" type="line"/>
+      <point x="475" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="154" y="482" type="line"/>
-      <point x="74" y="482" type="line"/>
-      <point x="74" y="166" type="line" smooth="yes"/>
-      <point x="74" y="59"/>
-      <point x="145" y="-10"/>
-      <point x="248" y="-10" type="curve" smooth="yes"/>
-      <point x="316" y="-10"/>
-      <point x="385" y="20"/>
-      <point x="434" y="73" type="curve"/>
-      <point x="415" y="124" type="line"/>
-      <point x="377" y="83"/>
-      <point x="324" y="60"/>
-      <point x="272" y="60" type="curve" smooth="yes"/>
-      <point x="197" y="60"/>
-      <point x="154" y="104"/>
-      <point x="154" y="182" type="curve" smooth="yes"/>
+      <point x="155" y="482" type="line"/>
+      <point x="75" y="482" type="line"/>
+      <point x="75" y="166" type="line" smooth="yes"/>
+      <point x="75" y="59"/>
+      <point x="146" y="-10"/>
+      <point x="249" y="-10" type="curve" smooth="yes"/>
+      <point x="317" y="-10"/>
+      <point x="386" y="20"/>
+      <point x="435" y="73" type="curve"/>
+      <point x="416" y="124" type="line"/>
+      <point x="378" y="83"/>
+      <point x="325" y="60"/>
+      <point x="273" y="60" type="curve" smooth="yes"/>
+      <point x="198" y="60"/>
+      <point x="155" y="104"/>
+      <point x="155" y="182" type="curve" smooth="yes"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uacute.glif b/src/Cantarell-Regular.ufo/glyphs/uacute.glif
index 41a6e7fa..bc6a57d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="190"/>
+    <component base="acutecomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ubreve.glif b/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
index e7c54b0b..406d7443 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="65"/>
+    <component base="brevecomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ucaron.glif b/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
index e2155d0d..a4591a06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="90"/>
+    <component base="caroncomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
index 485051ac..20d734b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="80"/>
+    <component base="circumflexcomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
index 67df8264..80bef4d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="19"/>
+    <component base="dblgravecomb" xOffset="20"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
index dbe50c94..1bbe1e07 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresis.glif b/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
index 26e60356..3d6fa94c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="40"/>
+    <component base="dieresiscomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
index 5c62f212..cab47c65 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_acutecomb" xOffset="49"/>
+    <component base="dieresiscomb_acutecomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
index 0a2e92b5..4d5483ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresiscaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_caroncomb" xOffset="49"/>
+    <component base="dieresiscomb_caroncomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
index 5d6e6106..3f0d3628 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresisgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_gravecomb" xOffset="49"/>
+    <component base="dieresiscomb_gravecomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
index 6c4c4917..5c052e4d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresismacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb_macroncomb" xOffset="49"/>
+    <component base="dieresiscomb_macroncomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
index a5669ec6..54a9d13a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ugrave.glif b/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
index d480c593..599a1739 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="95"/>
+    <component base="gravecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
index 69aedb55..06250994 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="120"/>
+    <component base="hookabovecomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorn.glif b/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
index 60c82121..a0a86f5a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="389"/>
+    <component base="horncomb" xOffset="390"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
index 19a34a5c..36d9a798 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="190"/>
+    <component base="acutecomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
index f3f2fc74..501ba9ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotbelowcomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
index a810716b..ae617e3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="95"/>
+    <component base="gravecomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
index 92206852..1c47470c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="120"/>
+    <component base="hookabovecomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
index 82704732..1f27c639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="650"/>
+  <advance width="651"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="41"/>
+    <component base="tildecomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
index 558126e2..5a6918a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
index 1a2c7e9d..5ef1be3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="85"/>
+    <component base="hungarumlautcomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
index 621289bb..ae7162b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="63"/>
+    <component base="breveinvertedcomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
index d0d6484d..bbecd793 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacron.glif b/src/Cantarell-Regular.ufo/glyphs/umacron.glif
index 1934defb..69910a33 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="28"/>
+    <component base="macroncomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
index aef4d91c..5d899182 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacrondieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb_dieresiscomb" xOffset="-2"/>
+    <component base="macroncomb_dieresiscomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uogonek.glif b/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
index 2e6f24d3..84c1d127 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="20"/>
+    <component base="ogonekcomb" xOffset="21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uring.glif b/src/Cantarell-Regular.ufo/glyphs/uring.glif
index 3caccf20..bc5d18e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="100"/>
+    <component base="ringcomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
index 1530c046..8881c0c2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/utilde.glif b/src/Cantarell-Regular.ufo/glyphs/utilde.glif
index cece19af..0266c5e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="41"/>
+    <component base="tildecomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
index c8bf3cda..aca91288 100644
--- a/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/utildeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="557"/>
+  <advance width="558"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb_acutecomb" xOffset="41"/>
+    <component base="tildecomb_acutecomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/y.glif b/src/Cantarell-Regular.ufo/glyphs/y.glif
index 91d85c8a..4351ab43 100644
--- a/src/Cantarell-Regular.ufo/glyphs/y.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/y.glif
@@ -1,28 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0079"/>
   <note>
 y
 </note>
-  <anchor x="381" y="0" name="bottom"/>
-  <anchor x="231" y="482" name="top"/>
+  <anchor x="380" y="0" name="bottom"/>
+  <anchor x="230" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="203" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="469" y="482" type="line"/>
-      <point x="389" y="482" type="line"/>
-      <point x="222" y="16" type="line"/>
-      <point x="266" y="16" type="line"/>
-      <point x="102" y="482" type="line"/>
-      <point x="13" y="482" type="line"/>
+      <point x="202" y="0" type="line"/>
+      <point x="280" y="0" type="line"/>
+      <point x="468" y="482" type="line"/>
+      <point x="388" y="482" type="line"/>
+      <point x="221" y="16" type="line"/>
+      <point x="265" y="16" type="line"/>
+      <point x="101" y="482" type="line"/>
+      <point x="12" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="116" y="-217" type="line"/>
-      <point x="201" y="-217" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="203" y="0" type="line"/>
+      <point x="115" y="-217" type="line"/>
+      <point x="200" y="-217" type="line"/>
+      <point x="280" y="0" type="line"/>
+      <point x="202" y="0" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>v</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>v</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yacute.glif b/src/Cantarell-Regular.ufo/glyphs/yacute.glif
index 84807077..ac98a551 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yacute" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="148"/>
+    <component base="acutecomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
index 18a08fff..4c121cb3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ycircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ycircumflex" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="38"/>
+    <component base="circumflexcomb" xOffset="37"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif b/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
index a843b9c1..895a4fde 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydieresis" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-2"/>
+    <component base="dieresiscomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
index b507acbc..a14f78fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotaccent" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="98"/>
+    <component base="dotaccentcomb" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
index e48b4188..78c41f3c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ydotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotbelow" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="245"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ygrave.glif b/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
index 141d9f18..375d5639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ygrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ygrave" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="53"/>
+    <component base="gravecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
index d7108156..a8d3d41f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yhookabove" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="78"/>
+    <component base="hookabovecomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ymacron.glif b/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
index 2a43f1f3..ea0a8022 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ymacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ymacron" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="-14"/>
+    <component base="macroncomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ytilde.glif b/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
index 0e4ecf89..4590e633 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ytilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ytilde" format="2">
-  <advance width="482"/>
+  <advance width="480"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="-1"/>
+    <component base="tildecomb" xOffset="-2"/>
   </outline>
 </glyph>


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