[cantarell-fonts/respacing] More respacing



commit d114683419958cb45e02688f71a56d9278c0386b
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sat Jun 1 22:14:53 2019 +0100

    More respacing

 src/Cantarell-Bold.ufo/glyphs/A_E_.glif            | 54 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_j.glif             |  2 +-
 src/Cantarell-Bold.ufo/glyphs/N_j.glif             |  2 +-
 src/Cantarell-Bold.ufo/glyphs/T_.glif              |  6 ++
 src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif   |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Bold.ufo/glyphs/V_.glif              |  8 ++-
 src/Cantarell-Bold.ufo/glyphs/W_.glif              |  6 ++
 src/Cantarell-Bold.ufo/glyphs/X_.glif              |  8 ++-
 src/Cantarell-Bold.ufo/glyphs/Y_.glif              |  8 ++-
 src/Cantarell-Bold.ufo/glyphs/Y_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_grave.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_macron.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/ae.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/aeacute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/aie-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/f_f_i.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/fi.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/i-cy.glif            |  2 +-
 src/Cantarell-Bold.ufo/glyphs/i.glif               |  5 +-
 src/Cantarell-Bold.ufo/glyphs/iacute.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ibreve.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/icaron.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/icircumflex.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idblgrave.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idieresis.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idotaccent.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idotbelow.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/idotless.glif        | 24 +++++---
 src/Cantarell-Bold.ufo/glyphs/igrave.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ihookabove.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/imacron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/iogonek.glif         |  6 +-
 src/Cantarell-Bold.ufo/glyphs/itilde.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/j.glif               |  4 +-
 src/Cantarell-Bold.ufo/glyphs/jacute.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/jdotless.glif        | 32 ++++++----
 src/Cantarell-Bold.ufo/glyphs/je-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/lj.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/nj.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/oe.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/thorn.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/yi-cy.glif           |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_E_.glif           | 54 ++++++++---------
 src/Cantarell-Light.ufo/glyphs/A_E_acute.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/H_a-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_j.glif            |  2 +-
 src/Cantarell-Light.ufo/glyphs/N_j.glif            |  2 +-
 src/Cantarell-Light.ufo/glyphs/T_.glif             |  6 ++
 src/Cantarell-Light.ufo/glyphs/V_.glif             |  6 ++
 src/Cantarell-Light.ufo/glyphs/W_.glif             |  8 ++-
 src/Cantarell-Light.ufo/glyphs/W_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_circumflex.glif   |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_dieresis.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_grave.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/X_.glif             |  8 ++-
 src/Cantarell-Light.ufo/glyphs/Y_.glif             |  6 ++
 src/Cantarell-Light.ufo/glyphs/ae.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/aeacute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/aie-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/f_f_i.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/fi.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/i-cy.glif           |  2 +-
 src/Cantarell-Light.ufo/glyphs/i.glif              |  5 +-
 src/Cantarell-Light.ufo/glyphs/iacute.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/ibreve.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/icaron.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/icircumflex.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/idblgrave.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/idieresis.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/idieresisacute.glif |  4 +-
 src/Cantarell-Light.ufo/glyphs/idotaccent.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/idotbelow.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/idotless.glif       | 24 +++++---
 src/Cantarell-Light.ufo/glyphs/igrave.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/ihookabove.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif |  4 +-
 src/Cantarell-Light.ufo/glyphs/imacron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/iogonek.glif        |  6 +-
 src/Cantarell-Light.ufo/glyphs/itilde.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/j.glif              |  4 +-
 src/Cantarell-Light.ufo/glyphs/jacute.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/jcircumflex.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/jdotless.glif       | 32 ++++++----
 src/Cantarell-Light.ufo/glyphs/je-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/lj.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/nj.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/oe.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/yi-cy.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_E_.glif         | 54 ++++++++---------
 src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/B_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_acute.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_caron.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif    |  2 +-
 .../glyphs/C_cedillaacute.glif                     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_acute.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_breve.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_caron.glif      |  2 +-
 .../glyphs/E_cedillabreve.glif                     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif |  2 +-
 .../glyphs/E_circumflexacute.glif                  |  2 +-
 .../glyphs/E_circumflexdotbelow.glif               |  2 +-
 .../glyphs/E_circumflexgrave.glif                  |  2 +-
 .../glyphs/E_circumflexhookabove.glif              |  2 +-
 .../glyphs/E_circumflextilde.glif                  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_grave.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif  |  2 +-
 .../glyphs/E_invertedbreve.glif                    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_macron.glif     |  2 +-
 .../glyphs/E_macronacute.glif                      |  2 +-
 .../glyphs/E_macrongrave.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif     |  2 +-
 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      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/F_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif       |  2 +-
 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           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/K_acute.glif      |  2 +-
 .../glyphs/K_commaaccent.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_J_.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_acute.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_caron.glif      |  2 +-
 .../glyphs/L_commaaccent.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_dot.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_j.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/L_slash.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/N_j.glif          |  2 +-
 src/Cantarell-Regular.ufo/glyphs/O_E_.glif         |  2 +-
 src/Cantarell-Regular.ufo/glyphs/P_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/Q_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_acute.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_caron.glif      |  2 +-
 .../glyphs/R_commaaccent.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif   |  2 +-
 .../glyphs/R_invertedbreve.glif                    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/S_.glif           | 70 +++++++++++-----------
 src/Cantarell-Regular.ufo/glyphs/S_acute.glif      |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_caron.glif      |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif |  4 +-
 .../glyphs/S_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif   |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Regular.ufo/glyphs/T_.glif           | 30 ++++++----
 src/Cantarell-Regular.ufo/glyphs/T_bar.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif    |  4 +-
 .../glyphs/T_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/T_horn.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_.glif           | 46 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/U_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif   |  4 +-
 .../glyphs/U_dieresisacute.glif                    |  6 +-
 .../glyphs/U_dieresiscaron.glif                    |  6 +-
 .../glyphs/U_dieresisgrave.glif                    |  6 +-
 .../glyphs/U_dieresismacron.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horn.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif  |  4 +-
 .../glyphs/U_horndotbelow.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif  |  4 +-
 .../glyphs/U_hornhookabove.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif  |  4 +-
 .../glyphs/U_hungarumlaut.glif                     |  4 +-
 .../glyphs/U_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron.glif     |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_ring.glif       |  4 +-
 .../glyphs/U_straight-cy.glif                      |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Regular.ufo/glyphs/U_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif |  6 +-
 src/Cantarell-Regular.ufo/glyphs/V_.glif           | 28 +++++----
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/W_.glif           | 44 ++++++++------
 src/Cantarell-Regular.ufo/glyphs/W_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/W_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/X_.glif           | 40 +++++++------
 src/Cantarell-Regular.ufo/glyphs/Y_.glif           | 34 ++++++-----
 src/Cantarell-Regular.ufo/glyphs/Y_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_.glif           | 30 +++++-----
 src/Cantarell-Regular.ufo/glyphs/Z_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/f_f_i.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/fi.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/i-cy.glif         |  2 +-
 src/Cantarell-Regular.ufo/glyphs/i.glif            |  5 +-
 src/Cantarell-Regular.ufo/glyphs/iacute.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ibreve.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/icaron.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/icircumflex.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/idblgrave.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/idieresis.glif    |  4 +-
 .../glyphs/idieresisacute.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/idotaccent.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/idotbelow.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/idotless.glif     | 24 +++++---
 src/Cantarell-Regular.ufo/glyphs/igrave.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ihookabove.glif   |  4 +-
 .../glyphs/iinvertedbreve.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/imacron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/iogonek.glif      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/itilde.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/j.glif            |  4 +-
 src/Cantarell-Regular.ufo/glyphs/jacute.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/jdotless.glif     | 32 ++++++----
 src/Cantarell-Regular.ufo/glyphs/je-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/lj.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/nj.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/yi-cy.glif        |  4 +-
 276 files changed, 813 insertions(+), 684 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
index 5e694b37..80d0c7d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="1023"/>
+  <advance width="1027"/>
   <unicode hex="00C6"/>
-  <anchor x="548" y="0" name="bottom"/>
-  <anchor x="548" y="694" name="top"/>
+  <anchor x="552" y="0" name="bottom"/>
+  <anchor x="552" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="-4" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="576" y="694" type="line"/>
-      <point x="413" y="694" type="line"/>
+      <point x="0" y="0" type="line"/>
+      <point x="190" y="0" type="line"/>
+      <point x="580" y="694" type="line"/>
+      <point x="417" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="202" y="149" type="line"/>
-      <point x="520" y="149" type="line"/>
-      <point x="520" y="305" type="line"/>
-      <point x="202" y="305" type="line"/>
+      <point x="206" y="149" type="line"/>
+      <point x="524" y="149" type="line"/>
+      <point x="524" y="305" type="line"/>
+      <point x="206" y="305" type="line"/>
     </contour>
     <contour>
-      <point x="480" y="0" type="line"/>
-      <point x="653" y="0" type="line"/>
-      <point x="653" y="694" type="line"/>
-      <point x="480" y="694" type="line"/>
+      <point x="484" y="0" type="line"/>
+      <point x="657" y="0" type="line"/>
+      <point x="657" y="694" type="line"/>
+      <point x="484" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="560" y="0" type="line"/>
-      <point x="978" y="0" type="line"/>
-      <point x="978" y="152" type="line"/>
-      <point x="560" y="152" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="982" y="0" type="line"/>
+      <point x="982" y="152" type="line"/>
+      <point x="564" y="152" type="line"/>
     </contour>
     <contour>
-      <point x="560" y="278" type="line"/>
-      <point x="950" y="278" type="line"/>
-      <point x="950" y="430" type="line"/>
-      <point x="560" y="430" type="line"/>
+      <point x="564" y="278" type="line"/>
+      <point x="954" y="278" type="line"/>
+      <point x="954" y="430" type="line"/>
+      <point x="564" y="430" type="line"/>
     </contour>
     <contour>
-      <point x="560" y="542" type="line"/>
-      <point x="978" y="542" type="line"/>
-      <point x="978" y="694" type="line"/>
-      <point x="560" y="694" type="line"/>
+      <point x="564" y="542" type="line"/>
+      <point x="982" y="542" type="line"/>
+      <point x="982" y="694" type="line"/>
+      <point x="564" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
index 68a6d46c..effb4bb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="1023"/>
+  <advance width="1027"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="469"/>
+    <component base="acutecomb.case" xOffset="473"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
index a70af3bb..9fec7540 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="1023"/>
+  <advance width="1027"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
index 8173abd4..317970f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="672"/>
+  <advance width="674"/>
   <unicode hex="0425"/>
   <anchor x="532" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_j.glif b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
index 4e1af392..c2fb07db 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="812"/>
+  <advance width="806"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_j.glif b/src/Cantarell-Bold.ufo/glyphs/N_j.glif
index b99ab734..c3619c94 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_j.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1043"/>
+  <advance width="1037"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_.glif b/src/Cantarell-Bold.ufo/glyphs/T_.glif
index 01947b2b..b95ac992 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_.glif
@@ -22,4 +22,10 @@ T
       <point x="10" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
index 3058a194..2ae87ea5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="04AE"/>
   <anchor x="334" y="233" name="center"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
index 51d1f7d4..6b20f900 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_.glif b/src/Cantarell-Bold.ufo/glyphs/V_.glif
index 7427420e..c43a8c30 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="672"/>
+  <advance width="673"/>
   <unicode hex="0056"/>
   <note>
 V
@@ -19,4 +19,10 @@ V
       <point x="-2" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_.glif b/src/Cantarell-Bold.ufo/glyphs/W_.glif
index 859fc1bf..b6c5a0b7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_.glif
@@ -27,4 +27,10 @@ W
       <point x="0" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/X_.glif b/src/Cantarell-Bold.ufo/glyphs/X_.glif
index da5ac3d3..a7976c92 100644
--- a/src/Cantarell-Bold.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/X_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="672"/>
+  <advance width="674"/>
   <unicode hex="0058"/>
   <note>
 X
@@ -29,4 +29,10 @@ X
       <point x="319" y="484" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_.glif b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
index 5314815a..16b7ae5a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="0059"/>
   <note>
 Y
@@ -22,4 +22,10 @@ Y
       <point x="245" y="251" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif b/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
index b37edca8..504c6a0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
index 2f9a0151..2c1be8a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
index 50139fbb..d79e9c4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
index 6aad8c26..da515319 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
index 5eba064f..f632efd5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif b/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
index cbaad132..fecc154e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
index 64884888..e264e8ed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif b/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
index 932fd02a..f46ca42d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
index fbbb025a..e9cac342 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="653"/>
+  <advance width="652"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ae.glif b/src/Cantarell-Bold.ufo/glyphs/ae.glif
index f960f248..fe300aae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ae.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="796"/>
+  <advance width="786"/>
   <unicode hex="00E6"/>
   <anchor x="397" y="0" name="bottom"/>
   <anchor x="397" y="490" name="top"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aeacute.glif b/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
index 979b399f..f8be85af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aeacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aeacute" format="2">
-  <advance width="796"/>
+  <advance width="786"/>
   <unicode hex="01FD"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
index 9b4eb9ea..894f432f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/aie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aie-cy" format="2">
-  <advance width="796"/>
+  <advance width="786"/>
   <unicode hex="04D5"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif b/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif
index 25fe7103..ca49a3d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/f_f_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_i" format="2">
-  <advance width="1053"/>
+  <advance width="1047"/>
   <outline>
     <component base="f_f"/>
     <component base="i" xOffset="766"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fi.glif b/src/Cantarell-Bold.ufo/glyphs/fi.glif
index 6b7cc702..48417c02 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fi.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="670"/>
+  <advance width="664"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/i-cy.glif b/src/Cantarell-Bold.ufo/glyphs/i-cy.glif
index e99c98f5..8a4a8c4e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/i-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/i-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i-cy" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/i.glif b/src/Cantarell-Bold.ufo/glyphs/i.glif
index b99280cb..6b0d43be 100644
--- a/src/Cantarell-Bold.ufo/glyphs/i.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/i.glif
@@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0069"/>
   <note>
 i
 </note>
-  <anchor x="155" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iacute.glif b/src/Cantarell-Bold.ufo/glyphs/iacute.glif
index 31a6a9fd..0f37340c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="48"/>
+    <component base="acutecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ibreve.glif b/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
index 6970e83e..438f37b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-72"/>
+    <component base="brevecomb" xOffset="-75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/icaron.glif b/src/Cantarell-Bold.ufo/glyphs/icaron.glif
index 0ae8ac37..8bae0529 100644
--- a/src/Cantarell-Bold.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-62"/>
+    <component base="caroncomb" xOffset="-65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
index 059d2338..101eaecd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-59"/>
+    <component base="circumflexcomb" xOffset="-62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
index 27812d9d..db2238ac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-157"/>
+    <component base="dblgravecomb" xOffset="-160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idieresis.glif b/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
index 2291d455..3000c3a0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-125"/>
+    <component base="dieresiscomb" xOffset="-128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
index 251386aa..a894ddfe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-112"/>
+    <component base="dieresiscomb_acutecomb" xOffset="-115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
index 50bf1aa3..e07871c4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
index 65b704a4..872e220c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xOffset="5"/>
+    <component base="dotbelowcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/idotless.glif b/src/Cantarell-Bold.ufo/glyphs/idotless.glif
index 2521998b..74949cec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/idotless.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0131"/>
   <note>
 dotlessi
 </note>
-  <anchor x="144" y="0" name="bottom"/>
-  <anchor x="183" y="10" name="ogonek"/>
-  <anchor x="144" y="490" name="top"/>
+  <anchor x="141" y="0" name="bottom"/>
+  <anchor x="180" y="10" name="ogonek"/>
+  <anchor x="141" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="57" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="230" y="490" type="line"/>
-      <point x="57" y="490" type="line"/>
+      <point x="54" y="0" type="line"/>
+      <point x="227" y="0" type="line"/>
+      <point x="227" y="490" type="line"/>
+      <point x="54" y="490" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/igrave.glif b/src/Cantarell-Bold.ufo/glyphs/igrave.glif
index 0c0db7e0..402e589d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-54"/>
+    <component base="gravecomb" xOffset="-57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif b/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
index 7cf9b54d..cf7c09d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-10"/>
+    <component base="hookabovecomb" xOffset="-13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
index 3192ee0c..6fbc25f2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-82"/>
+    <component base="breveinvertedcomb" xOffset="-85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/imacron.glif b/src/Cantarell-Bold.ufo/glyphs/imacron.glif
index 73c1ce7b..10f87562 100644
--- a/src/Cantarell-Bold.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-53"/>
+    <component base="macroncomb.narrow" xOffset="-56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iogonek.glif b/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
index 36bdc509..7f22d6d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb"/>
-    <component base="ogonekcomb.narrow" xOffset="-252"/>
+    <component base="dotaccentcomb" xOffset="-3"/>
+    <component base="ogonekcomb.narrow" xOffset="-255"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/itilde.glif b/src/Cantarell-Bold.ufo/glyphs/itilde.glif
index 54742386..0daf4f30 100644
--- a/src/Cantarell-Bold.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-91"/>
+    <component base="tildecomb" xOffset="-94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/j.glif b/src/Cantarell-Bold.ufo/glyphs/j.glif
index 3582cc23..320a8c4e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/j.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="006A"/>
   <note>
 j
 </note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb"/>
+    <component base="dotaccentcomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jacute.glif b/src/Cantarell-Bold.ufo/glyphs/jacute.glif
index afee8648..d09879d6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="48"/>
+    <component base="acutecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
index b7ee859f..5617b3a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-59"/>
+    <component base="circumflexcomb" xOffset="-62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/jdotless.glif b/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
index 012912be..44788956 100644
--- a/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/jdotless.glif
@@ -1,24 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0237"/>
   <note>
 uni0237
 </note>
-  <anchor x="134" y="0" name="bottom"/>
-  <anchor x="144" y="490" name="top"/>
+  <anchor x="131" y="0" name="bottom"/>
+  <anchor x="141" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="24" y="-232" type="line"/>
-      <point x="148" y="-191"/>
-      <point x="230" y="-88"/>
-      <point x="230" y="26" type="curve" smooth="yes"/>
-      <point x="230" y="490" type="line"/>
-      <point x="57" y="490" type="line"/>
-      <point x="57" y="26" type="line" smooth="yes"/>
-      <point x="57" y="-39"/>
-      <point x="26" y="-100"/>
-      <point x="-26" y="-138" type="curve"/>
+      <point x="21" y="-232" type="line"/>
+      <point x="145" y="-191"/>
+      <point x="227" y="-88"/>
+      <point x="227" y="26" type="curve" smooth="yes"/>
+      <point x="227" y="490" type="line"/>
+      <point x="54" y="490" type="line"/>
+      <point x="54" y="26" type="line" smooth="yes"/>
+      <point x="54" y="-39"/>
+      <point x="23" y="-100"/>
+      <point x="-29" y="-138" type="curve"/>
     </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/je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
index 7acb3d2d..bd4f1dde 100644
--- a/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lj.glif b/src/Cantarell-Bold.ufo/glyphs/lj.glif
index 0119d784..88dcdabd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="597"/>
+  <advance width="591"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nj.glif b/src/Cantarell-Bold.ufo/glyphs/nj.glif
index b9bc9fc5..0ea98a88 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="868"/>
+  <advance width="862"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oe.glif b/src/Cantarell-Bold.ufo/glyphs/oe.glif
index eca35590..64516e6c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oe.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="881"/>
+  <advance width="871"/>
   <unicode hex="0153"/>
   <anchor x="481" y="0" name="bottom"/>
   <anchor x="481" y="490" name="top"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/thorn.glif b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
index 85c3fe0a..9f57c703 100644
--- a/src/Cantarell-Bold.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="thorn" format="2">
-  <advance width="574"/>
+  <advance width="572"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
index 73fdfce1..ba840808 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="287"/>
+  <advance width="281"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-125"/>
+    <component base="dieresiscomb" xOffset="-128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_.glif b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
index 9e3a95b5..85b250a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="914"/>
+  <advance width="863"/>
   <unicode hex="00C6"/>
-  <anchor x="500" y="0" name="bottom"/>
-  <anchor x="500" y="694" name="top"/>
+  <anchor x="449" y="0" name="bottom"/>
+  <anchor x="449" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="51" y="0" type="line"/>
-      <point x="74" y="0" type="line"/>
-      <point x="493" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
+      <point x="0" y="0" type="line"/>
+      <point x="23" y="0" type="line"/>
+      <point x="442" y="694" type="line"/>
+      <point x="423" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="210" y="243" type="line"/>
-      <point x="488" y="243" type="line"/>
-      <point x="489" y="262" type="line"/>
-      <point x="219" y="262" type="line"/>
+      <point x="159" y="243" type="line"/>
+      <point x="437" y="243" type="line"/>
+      <point x="438" y="262" type="line"/>
+      <point x="168" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="478" y="0" type="line"/>
-      <point x="499" y="0" type="line"/>
-      <point x="499" y="694" type="line"/>
-      <point x="478" y="694" type="line"/>
+      <point x="427" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="487" y="0" type="line"/>
-      <point x="865" y="0" type="line"/>
-      <point x="865" y="18" type="line"/>
-      <point x="487" y="18" type="line"/>
+      <point x="436" y="0" type="line"/>
+      <point x="814" y="0" type="line"/>
+      <point x="814" y="18" type="line"/>
+      <point x="436" y="18" type="line"/>
     </contour>
     <contour>
-      <point x="487" y="351" type="line"/>
-      <point x="840" y="351" type="line"/>
-      <point x="840" y="369" type="line"/>
-      <point x="487" y="369" type="line"/>
+      <point x="436" y="351" type="line"/>
+      <point x="789" y="351" type="line"/>
+      <point x="789" y="369" type="line"/>
+      <point x="436" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="487" y="676" type="line"/>
-      <point x="865" y="676" type="line"/>
-      <point x="865" y="694" type="line"/>
-      <point x="487" y="694" type="line"/>
+      <point x="436" y="676" type="line"/>
+      <point x="814" y="676" type="line"/>
+      <point x="814" y="694" type="line"/>
+      <point x="436" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
index 5fb23bd9..9e6b9ec1 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="914"/>
+  <advance width="863"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="442"/>
+    <component base="acutecomb.case" xOffset="391"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
index 893acd57..b081c044 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="914"/>
+  <advance width="863"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
index d6273b27..d001e852 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="594"/>
+  <advance width="593"/>
   <unicode hex="0425"/>
   <anchor x="560" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_j.glif b/src/Cantarell-Light.ufo/glyphs/L_j.glif
index bf75897e..876d5c3d 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_j.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="691"/>
+  <advance width="686"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_j.glif b/src/Cantarell-Light.ufo/glyphs/N_j.glif
index d83c354d..d1d578f5 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_j.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="922"/>
+  <advance width="917"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_.glif b/src/Cantarell-Light.ufo/glyphs/T_.glif
index 34ee39e7..bf2f59eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_.glif
@@ -22,4 +22,10 @@ T
       <point x="39" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_.glif b/src/Cantarell-Light.ufo/glyphs/V_.glif
index 3b3fac6b..72e60ebc 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_.glif
@@ -19,4 +19,10 @@ V
       <point x="38" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_.glif b/src/Cantarell-Light.ufo/glyphs/W_.glif
index a4f97c6f..1934362b 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="0057"/>
   <note>
 W
@@ -27,4 +27,10 @@ W
       <point x="41" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_acute.glif b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
index 7c5fa934..28defc27 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
index 15657702..dccacc7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
index 55d01f69..5ab0998a 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
index 04735dec..01dde5d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="We-cy" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_grave.glif b/src/Cantarell-Light.ufo/glyphs/W_grave.glif
index 7d93ebff..e08d7823 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="986"/>
+  <advance width="985"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_.glif b/src/Cantarell-Light.ufo/glyphs/X_.glif
index 871c59b9..c8688c96 100644
--- a/src/Cantarell-Light.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/X_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="594"/>
+  <advance width="593"/>
   <unicode hex="0058"/>
   <note>
 X
@@ -29,4 +29,10 @@ X
       <point x="293" y="375" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_.glif b/src/Cantarell-Light.ufo/glyphs/Y_.glif
index 35e40140..d09bbc0c 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_.glif
@@ -22,4 +22,10 @@ Y
       <point x="254" y="333" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ae.glif b/src/Cantarell-Light.ufo/glyphs/ae.glif
index 07d2e526..d5b84e8f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ae.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="812"/>
+  <advance width="822"/>
   <unicode hex="00E6"/>
   <anchor x="406" y="0" name="bottom"/>
   <anchor x="406" y="480" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/aeacute.glif b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
index cbdf02bb..21ad247e 100644
--- a/src/Cantarell-Light.ufo/glyphs/aeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aeacute" format="2">
-  <advance width="812"/>
+  <advance width="822"/>
   <unicode hex="01FD"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
index 225308da..798bec34 100644
--- a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aie-cy" format="2">
-  <advance width="812"/>
+  <advance width="822"/>
   <unicode hex="04D5"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/f_f_i.glif b/src/Cantarell-Light.ufo/glyphs/f_f_i.glif
index dc0e788f..b0fc0fae 100644
--- a/src/Cantarell-Light.ufo/glyphs/f_f_i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/f_f_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_i" format="2">
-  <advance width="791"/>
+  <advance width="787"/>
   <outline>
     <component base="f_f"/>
     <component base="i" xOffset="590"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fi.glif b/src/Cantarell-Light.ufo/glyphs/fi.glif
index 30d55751..d4379ed8 100644
--- a/src/Cantarell-Light.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fi.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="496"/>
+  <advance width="492"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/i-cy.glif b/src/Cantarell-Light.ufo/glyphs/i-cy.glif
index a8a01ab8..6a353e5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/i-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i-cy" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/i.glif b/src/Cantarell-Light.ufo/glyphs/i.glif
index 78a06a4f..aa4711fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/i.glif
@@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0069"/>
   <note>
 i
 </note>
-  <anchor x="114" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
+    <component base="dotaccentcomb" xOffset="-19"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iacute.glif b/src/Cantarell-Light.ufo/glyphs/iacute.glif
index 69d279d2..85b00742 100644
--- a/src/Cantarell-Light.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="35"/>
+    <component base="acutecomb" xOffset="33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ibreve.glif b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
index 8bf804c7..de03f9b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-84"/>
+    <component base="brevecomb" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icaron.glif b/src/Cantarell-Light.ufo/glyphs/icaron.glif
index 760e3e7b..611894c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-81"/>
+    <component base="caroncomb" xOffset="-83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
index 0e1fc858..a4deda65 100644
--- a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-69"/>
+    <component base="circumflexcomb" xOffset="-71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
index ee76ea4f..f2d1ac14 100644
--- a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-150"/>
+    <component base="dblgravecomb" xOffset="-152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresis.glif b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
index a3d4369d..a00acf96 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-117"/>
+    <component base="dieresiscomb" xOffset="-119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
index 9fbcb67f..d2f3d22f 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-117"/>
+    <component base="dieresiscomb_acutecomb" xOffset="-119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
index 3a7ab240..4b40944e 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
+    <component base="dotaccentcomb" xOffset="-19"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
index fa8cc1e1..2c889ea4 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="5"/>
+    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="-11"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotless.glif b/src/Cantarell-Light.ufo/glyphs/idotless.glif
index dfbe0659..bc0a7fcc 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotless.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0131"/>
   <note>
 dotlessi
 </note>
-  <anchor x="100" y="0" name="bottom"/>
-  <anchor x="105" y="10" name="ogonek"/>
-  <anchor x="102" y="480" name="top"/>
+  <anchor x="98" y="0" name="bottom"/>
+  <anchor x="103" y="10" name="ogonek"/>
+  <anchor x="100" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="90" y="0" type="line"/>
-      <point x="111" y="0" type="line"/>
-      <point x="111" y="480" type="line"/>
-      <point x="90" y="480" type="line"/>
+      <point x="88" y="0" type="line"/>
+      <point x="109" y="0" type="line"/>
+      <point x="109" y="480" type="line"/>
+      <point x="88" y="480" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/igrave.glif b/src/Cantarell-Light.ufo/glyphs/igrave.glif
index f6eb2b0c..0fefa2aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-82"/>
+    <component base="gravecomb" xOffset="-84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
index 954f49b0..068944fb 100644
--- a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-50"/>
+    <component base="hookabovecomb" xOffset="-52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
index bdc1a3ec..4456408f 100644
--- a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-99"/>
+    <component base="breveinvertedcomb" xOffset="-101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/imacron.glif b/src/Cantarell-Light.ufo/glyphs/imacron.glif
index e1bfd5cd..ed2c9414 100644
--- a/src/Cantarell-Light.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-95"/>
+    <component base="macroncomb.narrow" xOffset="-97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iogonek.glif b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
index f54cc3d5..5757b33f 100644
--- a/src/Cantarell-Light.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-17"/>
-    <component base="ogonekcomb.narrow" xOffset="-271"/>
+    <component base="dotaccentcomb" xOffset="-19"/>
+    <component base="ogonekcomb.narrow" xOffset="-273"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/itilde.glif b/src/Cantarell-Light.ufo/glyphs/itilde.glif
index 3af3a145..3fc886f1 100644
--- a/src/Cantarell-Light.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-133"/>
+    <component base="tildecomb" xOffset="-135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/j.glif b/src/Cantarell-Light.ufo/glyphs/j.glif
index fde81334..1bf34006 100644
--- a/src/Cantarell-Light.ufo/glyphs/j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/j.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="202"/>
+  <advance width="197"/>
   <unicode hex="006A"/>
   <note>
 j
 </note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb" xOffset="-18"/>
+    <component base="dotaccentcomb" xOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jacute.glif b/src/Cantarell-Light.ufo/glyphs/jacute.glif
index bfd7d0dd..52e7c610 100644
--- a/src/Cantarell-Light.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="202"/>
+  <advance width="197"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="34"/>
+    <component base="acutecomb" xOffset="31"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
index 54e7efc8..39f5129d 100644
--- a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="202"/>
+  <advance width="197"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-70"/>
+    <component base="circumflexcomb" xOffset="-73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jdotless.glif b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
index 0722932c..423fd395 100644
--- a/src/Cantarell-Light.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
@@ -1,24 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="202"/>
+  <advance width="197"/>
   <unicode hex="0237"/>
   <note>
 uni0237
 </note>
-  <anchor x="101" y="0" name="bottom"/>
-  <anchor x="101" y="480" name="top"/>
+  <anchor x="98" y="0" name="bottom"/>
+  <anchor x="98" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="5" y="-219" type="line"/>
-      <point x="69" y="-191"/>
-      <point x="112" y="-129"/>
-      <point x="112" y="-64" type="curve" smooth="yes"/>
-      <point x="112" y="480" type="line"/>
-      <point x="91" y="480" type="line"/>
-      <point x="91" y="-64" type="line" smooth="yes"/>
-      <point x="91" y="-122"/>
-      <point x="54" y="-178"/>
-      <point x="-2" y="-206" type="curve"/>
+      <point x="2" y="-219" type="line"/>
+      <point x="66" y="-191"/>
+      <point x="109" y="-129"/>
+      <point x="109" y="-64" type="curve" smooth="yes"/>
+      <point x="109" y="480" type="line"/>
+      <point x="88" y="480" type="line"/>
+      <point x="88" y="-64" type="line" smooth="yes"/>
+      <point x="88" y="-122"/>
+      <point x="51" y="-178"/>
+      <point x="-5" y="-206" type="curve"/>
     </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/je-cy.glif b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
index e5c65f49..8de70167 100644
--- a/src/Cantarell-Light.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="202"/>
+  <advance width="197"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/lj.glif b/src/Cantarell-Light.ufo/glyphs/lj.glif
index 8a872605..74e82bbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="434"/>
+  <advance width="429"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/nj.glif b/src/Cantarell-Light.ufo/glyphs/nj.glif
index b2b1f677..e3715513 100644
--- a/src/Cantarell-Light.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="727"/>
+  <advance width="722"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/oe.glif b/src/Cantarell-Light.ufo/glyphs/oe.glif
index ee059ae9..dfdb8e9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oe.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="894"/>
+  <advance width="904"/>
   <unicode hex="0153"/>
   <anchor x="449" y="0" name="bottom"/>
   <anchor x="449" y="480" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
index e3c2f6cd..71f2c956 100644
--- a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="201"/>
+  <advance width="197"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-117"/>
+    <component base="dieresiscomb" xOffset="-119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
index fc6999fd..63847af2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="969"/>
+  <advance width="933"/>
   <unicode hex="00C6"/>
-  <anchor x="530" y="0" name="bottom"/>
-  <anchor x="530" y="694" name="top"/>
+  <anchor x="496" y="0" name="bottom"/>
+  <anchor x="496" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="34" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="540" y="694" type="line"/>
-      <point x="457" y="694" type="line"/>
+      <point x="0" y="0" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="423" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="254" y="202" type="line"/>
-      <point x="530" y="202" type="line"/>
-      <point x="530" y="282" type="line"/>
-      <point x="254" y="282" type="line"/>
+      <point x="220" y="202" type="line"/>
+      <point x="496" y="202" type="line"/>
+      <point x="496" y="282" type="line"/>
+      <point x="220" y="282" type="line"/>
     </contour>
     <contour>
-      <point x="481" y="0" type="line"/>
-      <point x="564" y="0" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="481" y="694" type="line"/>
+      <point x="447" y="0" type="line"/>
+      <point x="530" y="0" type="line"/>
+      <point x="530" y="694" type="line"/>
+      <point x="447" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="521" y="0" type="line"/>
-      <point x="917" y="0" type="line"/>
-      <point x="917" y="72" type="line"/>
-      <point x="521" y="72" type="line"/>
+      <point x="487" y="0" type="line"/>
+      <point x="883" y="0" type="line"/>
+      <point x="883" y="72" type="line"/>
+      <point x="487" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="521" y="323" type="line"/>
-      <point x="890" y="323" type="line"/>
-      <point x="890" y="395" type="line"/>
-      <point x="521" y="395" type="line"/>
+      <point x="487" y="323" type="line"/>
+      <point x="856" y="323" type="line"/>
+      <point x="856" y="395" type="line"/>
+      <point x="487" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="521" y="622" type="line"/>
-      <point x="917" y="622" type="line"/>
-      <point x="917" y="694" type="line"/>
-      <point x="521" y="694" type="line"/>
+      <point x="487" y="622" type="line"/>
+      <point x="883" y="622" type="line"/>
+      <point x="883" y="694" type="line"/>
+      <point x="487" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
index 9c312d2f..50277fcf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="969"/>
+  <advance width="933"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="442"/>
+    <component base="acutecomb.case" xOffset="408"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
index ad59bb4d..fc67211f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="969"/>
+  <advance width="933"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_.glif b/src/Cantarell-Regular.ufo/glyphs/B_.glif
index 187efe94..a5fbf27c 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="636"/>
+  <advance width="632"/>
   <unicode hex="0042"/>
   <note>
 B
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_.glif b/src/Cantarell-Regular.ufo/glyphs/C_.glif
index 882a9471..e768a8cc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="0043"/>
   <note>
 C
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
index dca8b9e9..9d068220 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
index ec978f9e..1970cbf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
index 9bcacec0..5fa8fa86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
index d9c47e42..52cc6fa1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
index a21ca8c2..624d01c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
index b5576d36..7b43a146 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="643"/>
+  <advance width="639"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
index 2b5f5876..f3af335b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1349"/>
+  <advance width="1329"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
index 835c9806..0554b26b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_.glif b/src/Cantarell-Regular.ufo/glyphs/E_.glif
index e62aa392..71c1fcb6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0045"/>
   <note>
 E
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
index 848be161..5cb4a985 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
index 3aeb061f..5553fc3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
index de41b7a7..1ba45a9b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
index 299d157e..dc942711 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
index 0fd1c159..35150312 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
index c83e1e26..1bafd31f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
index 6b6382ef..0c7c4991 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
index 2b48ff15..9ea67492 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
index c82f795f..164cffc4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
index 5e6be428..648d0f24 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
index 451e1f51..bf157ad2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
index 57bdc70f..3500a284 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
index 34fe8b21..758f8cee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
index fb903b18..a46ee61c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
index 6736e774..1cdd6091 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
index fd4ab248..ad1a23f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
index f68ea591..a391f569 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
index 91f651ec..5305f45a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
index 25b6ce09..c31e46b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
index c576af7f..89493da1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
index 74da354b..a051f947 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
index 0a0ad974..e30145a2 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="598"/>
+  <advance width="590"/>
   <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 860c392b..2f7927df 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="643"/>
+  <advance width="639"/>
   <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 1aa5b7b5..235d7b0e 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="643"/>
+  <advance width="639"/>
   <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 f68509a8..9e79281b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="580"/>
+  <advance width="578"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_.glif b/src/Cantarell-Regular.ufo/glyphs/F_.glif
index 96c18cb1..568b59ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="562"/>
+  <advance width="561"/>
   <unicode hex="0046"/>
   <note>
 F
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
index ced85276..3b25fa75 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="643"/>
+  <advance width="606"/>
   <unicode hex="0425"/>
   <anchor x="584" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 4043891d..a904bd73 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="580"/>
+  <advance width="578"/>
   <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 b95edf64..cfd36a5c 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="580"/>
+  <advance width="578"/>
   <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 422d0a7e..4168a392 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="580"/>
+  <advance width="578"/>
   <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 9286600d..58afc6a8 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="580"/>
+  <advance width="578"/>
   <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 6b47d4ce..2bb6d24e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="618"/>
+  <advance width="603"/>
   <unicode hex="004B"/>
   <note>
 K
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
index fadf981d..ad34e40c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="618"/>
+  <advance width="603"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
index 3d48cde2..b5be243a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="618"/>
+  <advance width="603"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_.glif b/src/Cantarell-Regular.ufo/glyphs/L_.glif
index 4d8d2247..7a7706a7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="004C"/>
   <note>
 L
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index be7c03c1..3a32d3de 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="918"/>
+  <advance width="913"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="511"/>
+    <component base="J" xOffset="506"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
index ac844488..f8eb9209 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
index 2e328d9a..b1f81249 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
index d58f2cbb..1f7668e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
index fa8a60bc..81997547 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
index fa2575a7..ef7362da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_j.glif b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
index 146582de..ac403df8 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="766"/>
+  <advance width="752"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="511"/>
+    <component base="j" xOffset="506"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
index 93130639..7a0f59d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
index ff0cdeab..86ac9311 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="511"/>
+  <advance width="506"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_j.glif b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
index dfbeff66..c9042147 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1005"/>
+  <advance width="996"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
index 31917d57..fce1e29a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="993"/>
+  <advance width="991"/>
   <unicode hex="0152"/>
   <anchor x="555" y="0" name="bottom"/>
   <anchor x="555" y="694" name="top"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_.glif b/src/Cantarell-Regular.ufo/glyphs/P_.glif
index 847a163a..502e1910 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="598"/>
+  <advance width="590"/>
   <unicode hex="0050"/>
   <note>
 P
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_.glif b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
index d7919b98..4ab24a41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="776"/>
+  <advance width="765"/>
   <unicode hex="0051"/>
   <note>
 Q
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
index db416042..c2407d8e 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="776"/>
+  <advance width="765"/>
   <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 32a560b0..532f3643 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0052"/>
   <note>
 R
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
index 1557893d..2eeabebf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
index eec96d86..9bc3372d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
index 634d966c..ccea10a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
index 649a62b4..df1b8b25 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
index c0e61742..7b47844a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
index d367ffdf..b16192eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
index fca8ca6a..1ef6c52b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="629"/>
+  <advance width="614"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_.glif b/src/Cantarell-Regular.ufo/glyphs/S_.glif
index 51d0698a..66e59329 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="285" y="694" name="top"/>
+  <anchor x="281" y="0" name="bottom"/>
+  <anchor x="281" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="430" y="-10"/>
-      <point x="531" y="69"/>
-      <point x="531" y="191" type="curve" smooth="yes"/>
-      <point x="531" y="437"/>
-      <point x="142" y="339"/>
-      <point x="142" y="518" type="curve" smooth="yes"/>
-      <point x="142" y="591"/>
-      <point x="201" y="631"/>
-      <point x="307" y="631" type="curve" smooth="yes"/>
-      <point x="366" y="631"/>
-      <point x="430" y="619"/>
-      <point x="480" y="598" type="curve"/>
-      <point x="505" y="663" type="line"/>
-      <point x="446" y="689"/>
-      <point x="379" y="703"/>
-      <point x="313" y="703" type="curve" smooth="yes"/>
-      <point x="158" y="703"/>
-      <point x="57" y="626"/>
-      <point x="57" y="505" type="curve" smooth="yes"/>
-      <point x="57" y="267"/>
-      <point x="445" y="356"/>
-      <point x="445" y="179" type="curve" smooth="yes"/>
-      <point x="445" y="109"/>
-      <point x="385" y="64"/>
-      <point x="280" y="64" type="curve" smooth="yes"/>
-      <point x="217" y="64"/>
-      <point x="139" y="81"/>
-      <point x="71" y="109" type="curve"/>
-      <point x="46" y="44" type="line"/>
-      <point x="123" y="9"/>
-      <point x="201" y="-10"/>
+      <point x="271" y="-10" type="curve" smooth="yes"/>
+      <point x="426" y="-10"/>
+      <point x="527" y="69"/>
+      <point x="527" y="191" type="curve" smooth="yes"/>
+      <point x="527" y="437"/>
+      <point x="138" y="339"/>
+      <point x="138" y="518" type="curve" smooth="yes"/>
+      <point x="138" y="591"/>
+      <point x="197" y="631"/>
+      <point x="303" y="631" type="curve" smooth="yes"/>
+      <point x="362" y="631"/>
+      <point x="426" y="619"/>
+      <point x="476" y="598" type="curve"/>
+      <point x="501" y="663" type="line"/>
+      <point x="442" y="689"/>
+      <point x="375" y="703"/>
+      <point x="309" y="703" type="curve" smooth="yes"/>
+      <point x="154" y="703"/>
+      <point x="53" y="626"/>
+      <point x="53" y="505" type="curve" smooth="yes"/>
+      <point x="53" y="267"/>
+      <point x="441" y="356"/>
+      <point x="441" y="179" type="curve" smooth="yes"/>
+      <point x="441" y="109"/>
+      <point x="381" y="64"/>
+      <point x="276" y="64" type="curve" smooth="yes"/>
+      <point x="213" y="64"/>
+      <point x="135" y="81"/>
+      <point x="67" y="109" type="curve"/>
+      <point x="42" y="44" type="line"/>
+      <point x="119" y="9"/>
+      <point x="197" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
index 47976fd7..9c1dddf4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="197"/>
+    <component base="acutecomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
index e2e27301..7b62b8b7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="197"/>
-    <component base="dotaccentcomb.case" xOffset="100" yOffset="107"/>
+    <component base="acutecomb.case" xOffset="193"/>
+    <component base="dotaccentcomb.case" xOffset="96" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
index c9e96a29..eca23d5a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="101"/>
+    <component base="caroncomb.case" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
index e14c32f9..c6c1f0e6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="101"/>
-    <component base="dotaccentcomb.case" xOffset="149" yOffset="142"/>
+    <component base="caroncomb.case" xOffset="97"/>
+    <component base="dotaccentcomb.case" xOffset="145" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
index c876d6d5..e23d504d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="138"/>
+    <component base="cedillacomb" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
index 72fcb712..1d9d22aa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="97"/>
+    <component base="circumflexcomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
index 716f5718..21ec8e5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="119"/>
+    <component base="commaaccentcomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
index bb1d07d0..f1c2bd14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="149"/>
+    <component base="dotaccentcomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
index dbf444be..fcd7a4bf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
index 13bc5a50..f1c6cb41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="577"/>
+  <advance width="569"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="149"/>
-    <component base="dotaccentcomb.case" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="145"/>
+    <component base="dotaccentcomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_.glif b/src/Cantarell-Regular.ufo/glyphs/T_.glif
index 7f33ab0f..94f20724 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_.glif
@@ -1,25 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="293" y="0" name="bottom"/>
-  <anchor x="293" y="347" name="center"/>
-  <anchor x="293" y="694" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="278" y="347" name="center"/>
+  <anchor x="278" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="251" y="0" type="line"/>
-      <point x="334" y="0" type="line"/>
-      <point x="334" y="660" type="line"/>
-      <point x="251" y="660" type="line"/>
+      <point x="236" y="0" type="line"/>
+      <point x="319" y="0" type="line"/>
+      <point x="319" y="660" type="line"/>
+      <point x="236" y="660" type="line"/>
     </contour>
     <contour>
-      <point x="20" y="622" type="line"/>
-      <point x="566" y="622" type="line"/>
-      <point x="566" y="694" type="line"/>
-      <point x="20" y="694" type="line"/>
+      <point x="5" y="622" type="line"/>
+      <point x="551" y="622" type="line"/>
+      <point x="551" y="694" type="line"/>
+      <point x="5" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
index caf2d2e0..bfc6d019 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="65" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="50" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
index c0f25735..528962ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="109"/>
+    <component base="caroncomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
index 9c16dcc3..65b715f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="146"/>
+    <component base="cedillacomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
index 5360c771..ca187d47 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="127"/>
+    <component base="commaaccentcomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
index 475361ed..0021ee2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="157"/>
+    <component base="dotbelowcomb" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
index bd7ad390..27c8f3b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="0422"/>
   <anchor x="614" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
index e2d1d1ff..45dcd272 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="598"/>
+  <advance width="590"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
index dd696b3d..f61f0d27 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="586"/>
+  <advance width="556"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="48"/>
+    <component base="macronbelowcomb" xOffset="33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_.glif b/src/Cantarell-Regular.ufo/glyphs/U_.glif
index 0ac55e4f..0733fdee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="347" y="0" name="bottom"/>
-  <anchor x="441" y="10" name="ogonek"/>
-  <anchor x="347" y="694" name="top"/>
-  <anchor x="682" y="694" name="topright"/>
+  <anchor x="333" y="0" name="bottom"/>
+  <anchor x="427" y="10" name="ogonek"/>
+  <anchor x="333" y="694" name="top"/>
+  <anchor x="668" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="342" y="-10" type="curve" smooth="yes"/>
-      <point x="503" y="-10"/>
-      <point x="611" y="92"/>
-      <point x="611" y="246" type="curve" smooth="yes"/>
-      <point x="611" y="694" type="line"/>
-      <point x="530" y="694" type="line"/>
-      <point x="530" y="236" type="line" smooth="yes"/>
-      <point x="530" y="127"/>
-      <point x="465" y="63"/>
-      <point x="353" y="63" type="curve" smooth="yes"/>
-      <point x="235" y="63"/>
-      <point x="167" y="133"/>
-      <point x="167" y="253" type="curve" smooth="yes"/>
-      <point x="167" y="694" type="line"/>
-      <point x="84" y="694" type="line"/>
-      <point x="84" y="243" type="line" smooth="yes"/>
-      <point x="84" y="90"/>
-      <point x="185" y="-10"/>
+      <point x="328" y="-10" type="curve" smooth="yes"/>
+      <point x="489" y="-10"/>
+      <point x="597" y="92"/>
+      <point x="597" y="246" type="curve" smooth="yes"/>
+      <point x="597" y="694" type="line"/>
+      <point x="516" y="694" type="line"/>
+      <point x="516" y="236" type="line" smooth="yes"/>
+      <point x="516" y="127"/>
+      <point x="451" y="63"/>
+      <point x="339" y="63" type="curve" smooth="yes"/>
+      <point x="221" y="63"/>
+      <point x="153" y="133"/>
+      <point x="153" y="253" type="curve" smooth="yes"/>
+      <point x="153" y="694" type="line"/>
+      <point x="70" y="694" type="line"/>
+      <point x="70" y="243" type="line" smooth="yes"/>
+      <point x="70" y="90"/>
+      <point x="171" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
index ea41ca6a..977ebde0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
index 61c28754..13df911c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="138"/>
+    <component base="brevecomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
index 3f57b6c2..dd7cc9da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="163"/>
+    <component base="caroncomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
index 5372fec4..a76df432 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="159"/>
+    <component base="circumflexcomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
index fab8c35f..81d09cb0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="126"/>
+    <component base="dblgravecomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
index bf4b557e..c86350fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="dieresiscomb.case" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
index 647653ea..bb41a99c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="acutecomb.case" xOffset="259" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="acutecomb.case" xOffset="245" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
index e30dd5e2..40983b8a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="caroncomb.case" xOffset="163" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="caroncomb.case" xOffset="149" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
index 787ff150..90ae1458 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="gravecomb.case" xOffset="152" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="gravecomb.case" xOffset="138" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
index 411c00a1..5ebc7d6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="111"/>
-    <component base="macroncomb.case" xOffset="105" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="macroncomb.case" xOffset="91" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
index 869817d5..19db7006 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="211"/>
+    <component base="dotbelowcomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
index b4507b73..333b8962 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="152"/>
+    <component base="gravecomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
index b3cb191f..5ff95ba9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="203"/>
+    <component base="hookabovecomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
index fc4a353c..2afdc343 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="540" yOffset="212"/>
+    <component base="horncomb" xOffset="526" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
index de6d90bc..fa9b6d6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
index c240cd4d..8fcde282 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="211"/>
+    <component base="dotbelowcomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
index e2716e65..467ca286 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="152"/>
+    <component base="gravecomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
index be8dff6d..3b18e155 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="203"/>
+    <component base="hookabovecomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
index 546f4cd4..241f61d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="107"/>
+    <component base="tildecomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
index 556de310..05d18a9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="137"/>
+    <component base="hungarumlautcomb.case" xOffset="123"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
index ded5ed9c..e0cfd506 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="150"/>
+    <component base="breveinvertedcomb.case" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
index 8c9933b0..8f6044c9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="105"/>
+    <component base="macroncomb.case" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
index e92e33be..d689c052 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="105"/>
-    <component base="dieresiscomb.case" xOffset="111" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="91"/>
+    <component base="dieresiscomb.case" xOffset="97" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
index 7a471f99..9d354e9b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="9"/>
+    <component base="ogonekcomb.tall.case" xOffset="-5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
index fefd6c0c..6c8a126e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="174"/>
+    <component base="ringcomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
index 0da39366..2fd05687 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="04AE"/>
   <anchor x="310" y="271" name="center"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
index 292c1f23..d5538bf6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
index 18cb25d3..b9a74fd1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="107"/>
+    <component base="tildecomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
index 1440e7e3..d94c91e3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="694"/>
+  <advance width="667"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="107"/>
-    <component base="acutecomb.case" xOffset="260" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="93"/>
+    <component base="acutecomb.case" xOffset="246" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_.glif b/src/Cantarell-Regular.ufo/glyphs/V_.glif
index 272b44ce..5aa4cae9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_.glif
@@ -1,22 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="637"/>
+  <advance width="607"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="319" y="0" name="bottom"/>
-  <anchor x="319" y="694" name="top"/>
+  <anchor x="304" y="0" name="bottom"/>
+  <anchor x="304" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="278" y="0" type="line"/>
-      <point x="359" y="0" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="528" y="694" type="line"/>
-      <point x="297" y="29" type="line"/>
-      <point x="347" y="29" type="line"/>
-      <point x="120" y="694" type="line"/>
-      <point x="25" y="694" type="line"/>
+      <point x="263" y="0" type="line"/>
+      <point x="344" y="0" type="line"/>
+      <point x="597" y="694" type="line"/>
+      <point x="513" y="694" type="line"/>
+      <point x="282" y="29" type="line"/>
+      <point x="332" y="29" type="line"/>
+      <point x="105" y="694" type="line"/>
+      <point x="10" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index 162ead60..f8956878 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="636"/>
+  <advance width="632"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_.glif b/src/Cantarell-Regular.ufo/glyphs/W_.glif
index 32b1f8d4..9c7e42be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_.glif
@@ -1,30 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="505" y="0" name="bottom"/>
-  <anchor x="505" y="694" name="top"/>
+  <anchor x="485" y="0" name="bottom"/>
+  <anchor x="485" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="249" y="0" type="line"/>
-      <point x="332" y="0" type="line"/>
-      <point x="524" y="653" type="line"/>
-      <point x="482" y="653" type="line"/>
-      <point x="690" y="0" type="line"/>
-      <point x="770" y="0" type="line"/>
-      <point x="986" y="694" type="line"/>
-      <point x="903" y="694" type="line"/>
-      <point x="711" y="39" type="line"/>
-      <point x="756" y="39" type="line"/>
-      <point x="555" y="689" type="line"/>
-      <point x="462" y="689" type="line"/>
-      <point x="273" y="39" type="line"/>
-      <point x="313" y="39" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="30" y="694" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="312" y="0" type="line"/>
+      <point x="504" y="653" type="line"/>
+      <point x="462" y="653" type="line"/>
+      <point x="670" y="0" type="line"/>
+      <point x="750" y="0" type="line"/>
+      <point x="966" y="694" type="line"/>
+      <point x="883" y="694" type="line"/>
+      <point x="691" y="39" type="line"/>
+      <point x="736" y="39" type="line"/>
+      <point x="535" y="689" type="line"/>
+      <point x="442" y="689" type="line"/>
+      <point x="253" y="39" type="line"/>
+      <point x="293" y="39" type="line"/>
+      <point x="106" y="694" type="line"/>
+      <point x="10" y="694" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
index d364f896..ad942fc6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="417"/>
+    <component base="acutecomb.case" xOffset="397"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
index 1dbff283..20cbdf3d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="317"/>
+    <component base="circumflexcomb.case" xOffset="297"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
index bc4e7f0d..069806c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="269"/>
+    <component base="dieresiscomb.case" xOffset="249"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
index 3cff651e..b52e93db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="We-cy" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
index baa87ad2..38e46658 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="1016"/>
+  <advance width="976"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="310"/>
+    <component base="gravecomb.case" xOffset="290"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/X_.glif b/src/Cantarell-Regular.ufo/glyphs/X_.glif
index 4679e6a0..23076282 100644
--- a/src/Cantarell-Regular.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/X_.glif
@@ -1,32 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="643"/>
+  <advance width="606"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="322" y="0" name="bottom"/>
-  <anchor x="322" y="694" name="top"/>
+  <anchor x="303" y="0" name="bottom"/>
+  <anchor x="303" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="516" y="0" type="line"/>
-      <point x="615" y="0" type="line"/>
-      <point x="350" y="383" type="line"/>
-      <point x="148" y="694" type="line"/>
-      <point x="49" y="694" type="line"/>
-      <point x="294" y="331" type="line"/>
+      <point x="497" y="0" type="line"/>
+      <point x="596" y="0" type="line"/>
+      <point x="331" y="383" type="line"/>
+      <point x="129" y="694" type="line"/>
+      <point x="30" y="694" type="line"/>
+      <point x="275" y="331" type="line"/>
     </contour>
     <contour>
-      <point x="29" y="0" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="326" y="309" type="line"/>
-      <point x="283" y="373" type="line"/>
+      <point x="10" y="0" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="307" y="309" type="line"/>
+      <point x="264" y="373" type="line"/>
     </contour>
     <contour>
-      <point x="354" y="351" type="line"/>
-      <point x="589" y="694" type="line"/>
-      <point x="495" y="694" type="line"/>
-      <point x="311" y="415" type="line"/>
+      <point x="335" y="351" type="line"/>
+      <point x="570" y="694" type="line"/>
+      <point x="476" y="694" type="line"/>
+      <point x="292" y="415" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_.glif b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
index edf0ac62..4208cbbb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
@@ -1,25 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="305" y="0" name="bottom"/>
-  <anchor x="305" y="694" name="top"/>
-  <anchor x="27" y="694" name="topleft"/>
+  <anchor x="295" y="0" name="bottom"/>
+  <anchor x="295" y="694" name="top"/>
+  <anchor x="17" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="260" y="0" type="line"/>
-      <point x="343" y="0" type="line"/>
-      <point x="343" y="299" type="line"/>
-      <point x="583" y="694" type="line"/>
-      <point x="492" y="694" type="line"/>
-      <point x="299" y="362" type="line"/>
-      <point x="310" y="362" type="line"/>
-      <point x="112" y="694" type="line"/>
-      <point x="15" y="694" type="line"/>
-      <point x="260" y="299" type="line"/>
+      <point x="250" y="0" type="line"/>
+      <point x="333" y="0" type="line"/>
+      <point x="333" y="299" type="line"/>
+      <point x="573" y="694" type="line"/>
+      <point x="482" y="694" type="line"/>
+      <point x="289" y="362" type="line"/>
+      <point x="300" y="362" type="line"/>
+      <point x="102" y="694" type="line"/>
+      <point x="5" y="694" type="line"/>
+      <point x="250" y="299" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
index f739e0b5..996a702d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="217"/>
+    <component base="acutecomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
index 99ba6b00..661885ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="117"/>
+    <component base="circumflexcomb.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
index d76b7d39..41e05d43 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="69"/>
+    <component base="dieresiscomb.case" xOffset="59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
index 7cdb7722..315f246f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="169"/>
+    <component base="dotaccentcomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
index 8d91e821..afc37ad3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="169"/>
+    <component base="dotbelowcomb" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
index 2170491f..0c9877fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="110"/>
+    <component base="gravecomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
index c5da57b8..12d5c59b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="161"/>
+    <component base="hookabovecomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
index 8bbda1ed..d9b9c583 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="63"/>
+    <component base="macroncomb.case" xOffset="53"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
index fee72a07..81b00348 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="598"/>
+  <advance width="578"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="65"/>
+    <component base="tildecomb.case" xOffset="55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_.glif b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
index 4cc4119d..f23fe194 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="638"/>
+  <advance width="618"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="319" y="0" name="bottom"/>
-  <anchor x="319" y="694" name="top"/>
+  <anchor x="309" y="0" name="bottom"/>
+  <anchor x="309" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="40" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="598" y="72" type="line"/>
-      <point x="118" y="72" type="line"/>
-      <point x="130" y="47" type="line"/>
-      <point x="585" y="642" type="line"/>
-      <point x="585" y="694" type="line"/>
-      <point x="54" y="694" type="line"/>
-      <point x="54" y="622" type="line"/>
-      <point x="506" y="622" type="line"/>
-      <point x="494" y="647" type="line"/>
-      <point x="40" y="53" type="line"/>
+      <point x="30" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="72" type="line"/>
+      <point x="108" y="72" type="line"/>
+      <point x="120" y="47" type="line"/>
+      <point x="575" y="642" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="44" y="694" type="line"/>
+      <point x="44" y="622" type="line"/>
+      <point x="496" y="622" type="line"/>
+      <point x="484" y="647" type="line"/>
+      <point x="30" y="53" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
index 0ee2ba9f..de766a3d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="638"/>
+  <advance width="618"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="231"/>
+    <component base="acutecomb.case" xOffset="221"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
index 4d6fcc16..553bd322 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="638"/>
+  <advance width="618"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="135"/>
+    <component base="caroncomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
index 92a8d900..ff7d12b2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="638"/>
+  <advance width="618"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="183"/>
+    <component base="dotaccentcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
index c531fc2f..573fb05b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="638"/>
+  <advance width="618"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="183"/>
+    <component base="dotbelowcomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/f_f_i.glif b/src/Cantarell-Regular.ufo/glyphs/f_f_i.glif
index 64000238..755f192f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/f_f_i.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/f_f_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_i" format="2">
-  <advance width="934"/>
+  <advance width="926"/>
   <outline>
     <component base="f_f"/>
     <component base="i" xOffset="680"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fi.glif b/src/Cantarell-Regular.ufo/glyphs/fi.glif
index ba879a79..5b071e73 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fi.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
index cc5ce851..23b75d0d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/i-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i-cy" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/i.glif b/src/Cantarell-Regular.ufo/glyphs/i.glif
index 33d67d80..7c4df345 100644
--- a/src/Cantarell-Regular.ufo/glyphs/i.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/i.glif
@@ -1,13 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0069"/>
   <note>
 i
 </note>
-  <anchor x="128" y="0" name="bottom"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iacute.glif b/src/Cantarell-Regular.ufo/glyphs/iacute.glif
index 6d44d9cb..4a3e06ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="45"/>
+    <component base="acutecomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ibreve.glif b/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
index 25bc8507..6ebf9471 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-80"/>
+    <component base="brevecomb" xOffset="-84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/icaron.glif b/src/Cantarell-Regular.ufo/glyphs/icaron.glif
index 041f2407..405599dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-55"/>
+    <component base="caroncomb" xOffset="-59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
index 950ac45b..0b16887e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-65"/>
+    <component base="circumflexcomb" xOffset="-69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
index 5aa6cb5b..2ea10c40 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-126"/>
+    <component base="dblgravecomb" xOffset="-130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idieresis.glif b/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
index 0e95dd66..7263b4a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-105"/>
+    <component base="dieresiscomb" xOffset="-109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
index dc3fcd07..b6c4c16f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idieresisacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb_acutecomb" xOffset="-96"/>
+    <component base="dieresiscomb_acutecomb" xOffset="-100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
index 26596402..a35ba8c2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
index 62461bf8..c9ba66e0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="4"/>
+    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/idotless.glif b/src/Cantarell-Regular.ufo/glyphs/idotless.glif
index 85c05ff6..84c0e03a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/idotless.glif
@@ -1,19 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0131"/>
   <note>
 dotlessi
 </note>
-  <anchor x="127" y="0" name="bottom"/>
-  <anchor x="145" y="10" name="ogonek"/>
-  <anchor x="128" y="482" name="top"/>
+  <anchor x="123" y="0" name="bottom"/>
+  <anchor x="141" y="10" name="ogonek"/>
+  <anchor x="124" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="87" y="0" type="line"/>
-      <point x="167" y="0" type="line"/>
-      <point x="167" y="482" type="line"/>
-      <point x="87" y="482" type="line"/>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/igrave.glif b/src/Cantarell-Regular.ufo/glyphs/igrave.glif
index 90370d1e..af6ca586 100644
--- a/src/Cantarell-Regular.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-50"/>
+    <component base="gravecomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
index 27edbb5b..aa19a71e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-25"/>
+    <component base="hookabovecomb" xOffset="-29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
index 6cf05259..fb1fe44b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-82"/>
+    <component base="breveinvertedcomb" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/imacron.glif b/src/Cantarell-Regular.ufo/glyphs/imacron.glif
index 1635bed7..6f099a13 100644
--- a/src/Cantarell-Regular.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-67"/>
+    <component base="macroncomb.narrow" xOffset="-71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iogonek.glif b/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
index deed47ab..9450cf1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
-    <component base="ogonekcomb.narrow" xOffset="-264"/>
+    <component base="dotaccentcomb" xOffset="-9"/>
+    <component base="ogonekcomb.narrow" xOffset="-268"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/itilde.glif b/src/Cantarell-Regular.ufo/glyphs/itilde.glif
index 305c49ec..587b10b3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-104"/>
+    <component base="tildecomb" xOffset="-108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/j.glif b/src/Cantarell-Regular.ufo/glyphs/j.glif
index 988c27cf..4dbd5702 100644
--- a/src/Cantarell-Regular.ufo/glyphs/j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/j.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="006A"/>
   <note>
 j
 </note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb" xOffset="-5"/>
+    <component base="dotaccentcomb" xOffset="-10"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jacute.glif b/src/Cantarell-Regular.ufo/glyphs/jacute.glif
index 8182561c..2db744f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="45"/>
+    <component base="acutecomb" xOffset="40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
index de8d81d3..ee06e24f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-65"/>
+    <component base="circumflexcomb" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/jdotless.glif b/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
index 2169ab1f..dfbde61a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/jdotless.glif
@@ -1,24 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0237"/>
   <note>
 uni0237
 </note>
-  <anchor x="128" y="0" name="bottom"/>
-  <anchor x="128" y="482" name="top"/>
+  <anchor x="123" y="0" name="bottom"/>
+  <anchor x="123" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="24" y="-227" type="line"/>
-      <point x="115" y="-187"/>
-      <point x="168" y="-111"/>
-      <point x="168" y="-23" type="curve" smooth="yes"/>
-      <point x="168" y="482" type="line"/>
-      <point x="88" y="482" type="line"/>
-      <point x="88" y="-35" type="line" smooth="yes"/>
-      <point x="88" y="-91"/>
-      <point x="52" y="-148"/>
-      <point x="-2" y="-179" type="curve"/>
+      <point x="19" y="-227" type="line"/>
+      <point x="110" y="-187"/>
+      <point x="163" y="-111"/>
+      <point x="163" y="-23" type="curve" smooth="yes"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+      <point x="83" y="-35" type="line" smooth="yes"/>
+      <point x="83" y="-91"/>
+      <point x="47" y="-148"/>
+      <point x="-7" y="-179" type="curve"/>
     </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/je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
index b08064af..faa1d49c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="255"/>
+  <advance width="246"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lj.glif b/src/Cantarell-Regular.ufo/glyphs/lj.glif
index d94af49d..c494f14a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="526"/>
+  <advance width="517"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nj.glif b/src/Cantarell-Regular.ufo/glyphs/nj.glif
index 88002fee..28d93071 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nj.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="822"/>
+  <advance width="813"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
index 0a3a525b..63cd692e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="254"/>
+  <advance width="246"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-105"/>
+    <component base="dieresiscomb" xOffset="-109"/>
   </outline>
 </glyph>



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