[cantarell-fonts/respacing] Spacing of extra bold and thin



commit 32a6d97f88d2ba1e1e035d31295611bdf65e2bf3
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Jun 2 23:28:02 2019 +0100

    Spacing of extra bold and thin

 src/Cantarell-Bold.ufo/glyphs/B_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif  |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_breve.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif  |  2 +-
 src/Cantarell-Bold.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-Bold.ufo/glyphs/E_dblgrave.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_grave.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_macron.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_tilde.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/F_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_breve.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_macron.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/J_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/J_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/K_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/K_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_J_.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_dot.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_j.glif             |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/L_slash.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/N_J_.glif            |  2 +-
 src/Cantarell-Bold.ufo/glyphs/P_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Q_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/S_.glif              | 70 +++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/S_acute.glif         |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/S_caron.glif         |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif      |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Bold.ufo/glyphs/T_.glif              | 24 ++++----
 src/Cantarell-Bold.ufo/glyphs/T_bar.glif           |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_.glif              | 52 +++++++++-------
 src/Cantarell-Bold.ufo/glyphs/U_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif |  6 +-
 .../glyphs/U_dieresismacron.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horn.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_macron.glif        |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_ring.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Z_.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Z_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Z_caron.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/f_f_l.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/fl.glif              |  2 +-
 src/Cantarell-Bold.ufo/glyphs/l.glif               | 50 +++++++++-------
 src/Cantarell-Bold.ufo/glyphs/lacute.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/layerinfo.plist      | 10 ++--
 src/Cantarell-Bold.ufo/glyphs/lcaron.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ldot.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/lj.glif              |  4 +-
 src/Cantarell-Bold.ufo/glyphs/llinebelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/lslash.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/t.glif               | 48 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/tbar.glif            |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tcaron.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tcedilla.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tdieresis.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/v.glif               |  6 ++
 src/Cantarell-Bold.ufo/glyphs/w.glif               |  6 ++
 src/Cantarell-Light.ufo/glyphs/B_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_caron.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_cedilla.glif      |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_circumflex.glif   |  2 +-
 src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif      |  2 +-
 src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_breve.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_caron.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif |  2 +-
 src/Cantarell-Light.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-Light.ufo/glyphs/E_dblgrave.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_dieresis.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_grave.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_hookabove.glif    |  2 +-
 .../glyphs/E_invertedbreve.glif                    |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_macron.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_macronacute.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_ogonek.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_r-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_s-cy.glif         |  2 +-
 .../glyphs/E_sdescender-cy.glif                    |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_tilde.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/F_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_breve.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_caron.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_circumflex.glif   |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/G_macron.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/H_a-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/I_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/I_o-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/J_.glif             | 38 ++++++------
 src/Cantarell-Light.ufo/glyphs/J_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/J_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/J_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/K_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/K_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_J_.glif           |  4 +-
 src/Cantarell-Light.ufo/glyphs/L_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_caron.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_dot.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_j.glif            |  4 +-
 src/Cantarell-Light.ufo/glyphs/L_linebelow.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/L_slash.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/N_J_.glif           |  2 +-
 src/Cantarell-Light.ufo/glyphs/P_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/Q_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_acute.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_caron.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif     |  2 +-
 .../glyphs/R_invertedbreve.glif                    |  2 +-
 src/Cantarell-Light.ufo/glyphs/R_linebelow.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/S_.glif             | 70 +++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/S_acute.glif        |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Light.ufo/glyphs/S_caron.glif        |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Light.ufo/glyphs/S_cedilla.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/S_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif  |  4 +-
 src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif     |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Light.ufo/glyphs/T_.glif             | 24 ++++----
 src/Cantarell-Light.ufo/glyphs/T_bar.glif          |  4 +-
 src/Cantarell-Light.ufo/glyphs/T_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/T_cedilla.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif  |  4 +-
 src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/T_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/T_linebelow.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_.glif             | 52 +++++++++-------
 src/Cantarell-Light.ufo/glyphs/U_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_breve.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif     |  4 +-
 src/Cantarell-Light.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-Light.ufo/glyphs/U_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_hookabove.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_horn.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_hornacute.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_horngrave.glif    |  4 +-
 .../glyphs/U_hornhookabove.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_horntilde.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif |  4 +-
 .../glyphs/U_invertedbreve.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron.glif       |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Light.ufo/glyphs/U_ogonek.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_ring.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif  |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Light.ufo/glyphs/U_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif   |  6 +-
 src/Cantarell-Light.ufo/glyphs/V_.glif             | 22 +++----
 src/Cantarell-Light.ufo/glyphs/V_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_.glif             | 36 +++++------
 src/Cantarell-Light.ufo/glyphs/W_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/W_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/W_dieresis.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/W_e-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/W_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/X_.glif             | 34 +++++------
 src/Cantarell-Light.ufo/glyphs/Y_.glif             | 28 ++++-----
 src/Cantarell-Light.ufo/glyphs/Y_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_macron.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/Y_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/Z_.glif             | 30 +++++-----
 src/Cantarell-Light.ufo/glyphs/Z_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/Z_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/c.glif              |  2 +-
 src/Cantarell-Light.ufo/glyphs/cacute.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/ccaron.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/ccedilla.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/ccircumflex.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/cdotaccent.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/es-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif |  2 +-
 src/Cantarell-Light.ufo/glyphs/f_f_l.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/fl.glif             |  2 +-
 src/Cantarell-Light.ufo/glyphs/l.glif              | 50 +++++++++-------
 src/Cantarell-Light.ufo/glyphs/lacute.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/layerinfo.plist     |  2 +-
 src/Cantarell-Light.ufo/glyphs/lcaron.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/ldot.glif           |  4 +-
 src/Cantarell-Light.ufo/glyphs/ldotbelow.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/lj.glif             |  4 +-
 src/Cantarell-Light.ufo/glyphs/llinebelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/lslash.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/t.glif              | 48 +++++++--------
 src/Cantarell-Light.ufo/glyphs/tbar.glif           |  2 +-
 src/Cantarell-Light.ufo/glyphs/tcaron.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/tcedilla.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif   |  2 +-
 src/Cantarell-Light.ufo/glyphs/tdieresis.glif      |  2 +-
 src/Cantarell-Light.ufo/glyphs/tdotbelow.glif      |  2 +-
 src/Cantarell-Light.ufo/glyphs/tlinebelow.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/v.glif              |  6 ++
 src/Cantarell-Light.ufo/glyphs/w.glif              |  8 ++-
 src/Cantarell-Light.ufo/glyphs/wacute.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/wcircumflex.glif    |  2 +-
 src/Cantarell-Light.ufo/glyphs/wdieresis.glif      |  2 +-
 src/Cantarell-Light.ufo/glyphs/we-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/wgrave.glif         |  2 +-
 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_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/G_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_breve.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_caron.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif |  2 +-
 .../glyphs/G_commaaccent.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_macron.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/J_.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/J_acute.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/J_e-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_J_.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/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           | 24 ++++----
 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_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_.glif           | 52 +++++++++-------
 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           | 22 +++----
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/W_.glif           | 38 ++++++------
 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           | 34 +++++------
 src/Cantarell-Regular.ufo/glyphs/Y_.glif           | 28 ++++-----
 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_l.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/fl.glif           |  2 +-
 src/Cantarell-Regular.ufo/glyphs/l.glif            | 50 +++++++++-------
 src/Cantarell-Regular.ufo/glyphs/lacute.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/layerinfo.plist   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/lcaron.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ldot.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/lj.glif           |  4 +-
 src/Cantarell-Regular.ufo/glyphs/llinebelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/lslash.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/one.glif          |  8 +--
 src/Cantarell-Regular.ufo/glyphs/t.glif            | 48 +++++++--------
 src/Cantarell-Regular.ufo/glyphs/tbar.glif         |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tcaron.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tcedilla.glif     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tdieresis.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif   |  2 +-
 src/Cantarell-Regular.ufo/glyphs/v.glif            |  6 ++
 src/Cantarell-Regular.ufo/glyphs/w.glif            |  8 ++-
 src/Cantarell-Regular.ufo/glyphs/wacute.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/wdieresis.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/we-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/wgrave.glif       |  2 +-
 501 files changed, 1312 insertions(+), 1240 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_.glif b/src/Cantarell-Bold.ufo/glyphs/B_.glif
index abfa265c..4de5bad1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="640"/>
+  <advance width="638"/>
   <unicode hex="0042"/>
   <note>
 B
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_.glif b/src/Cantarell-Bold.ufo/glyphs/C_.glif
index 4774cd0b..8395f6ab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="0043"/>
   <note>
 C
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
index 42b82076..9e3e0e17 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
index ab827f2c..cbd10e7b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
index 3b7440d7..3a9b59f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
index 624bad4d..50c3dfc2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
index 3cff8546..2a7c50f9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
index 810311ea..1d54a6c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
index de73b5aa..916e45b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1371"/>
+  <advance width="1367"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif
index 23186a9f..1f225950 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Bold.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="584"/>
+  <advance width="559"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_.glif b/src/Cantarell-Bold.ufo/glyphs/E_.glif
index 4e03ee38..146c38d9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0045"/>
   <note>
 E
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
index 5b9fbc4b..8284b997 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
index 53e3b6f8..43137b19 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
index baca4545..7207d73a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
index e7809be6..df89cae4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
index 774ccef0..c905f77e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
index 740673a4..bc91469b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
index ce520618..2e9d75f9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
index 0a638539..94445e4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
index e56c26a1..5c88dde8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
index d072fcee..f12cd7db 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
index e9473f53..9777ba78 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
index 46a82b82..ee75ec48 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
index b85e5f91..0fa7d6a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
index fe74a052..83290ceb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
index ee9ad512..6a146d2a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
index 63b475de..05e0dc25 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
index ebd67d85..3ae3ddc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
index 4a87c573..1499451b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
index 309e62aa..56e3a023 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
index 0eb507a7..c8f9ff5f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
index 3f3a8c33..0de00719 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0118"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
index 18bfb972..443732f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="614"/>
+  <advance width="609"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
index 84ba8b0a..6affa99e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="0421"/>
   <anchor x="342" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
index 0bb2ad8a..8803d8aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="623"/>
+  <advance width="618"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
index c5ca77eb..6e4eb40d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_.glif b/src/Cantarell-Bold.ufo/glyphs/F_.glif
index 9e6075a1..21709135 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/F_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="571"/>
+  <advance width="572"/>
   <unicode hex="0046"/>
   <note>
 F
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_.glif b/src/Cantarell-Bold.ufo/glyphs/G_.glif
index 7eed816d..92010588 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="0047"/>
   <note>
 G
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
index 96c69a23..2b028edd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
index 3095f0f4..fe21097d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
index abb5ea59..b2fe87a5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
index 804acdd0..a9cd6df6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
index 5f3a1a69..0a89eb8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
index e73148f0..84155394 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="711"/>
+  <advance width="708"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
index 2c01ddb9..9f4f87ae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0415"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
index 5c5b9273..f306b3ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
index 17a08d62..c5cfc29f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
index 919108db..adeb8397 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="598"/>
+  <advance width="589"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_.glif b/src/Cantarell-Bold.ufo/glyphs/J_.glif
index dd672482..1f8859c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="455"/>
+  <advance width="447"/>
   <unicode hex="004A"/>
   <note>
 J
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_acute.glif b/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
index 1741c3d4..a338f286 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="455"/>
+  <advance width="447"/>
   <outline>
     <component base="J"/>
     <component base="acutecomb.case" xOffset="231"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
index 1472cf9b..27f22f83 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="455"/>
+  <advance width="447"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
index 390fcc00..69cf1d65 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="455"/>
+  <advance width="447"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_.glif b/src/Cantarell-Bold.ufo/glyphs/K_.glif
index 6cee5483..9f202c3b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="673"/>
+  <advance width="670"/>
   <unicode hex="004B"/>
   <note>
 K
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
index b5aab542..0dc55cf5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="673"/>
+  <advance width="670"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
index 84890b2f..d2f3bf32 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="673"/>
+  <advance width="670"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_.glif b/src/Cantarell-Bold.ufo/glyphs/L_.glif
index 58f77038..f3269f63 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="004C"/>
   <note>
 L
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
index 75e8e4bd..fde8b323 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="980"/>
+  <advance width="967"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="525"/>
+    <component base="J" xOffset="520"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
index 5c9ec99c..8832eda3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
index fa3183d0..bec501df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
index f1a09608..f7715aa7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
index b539b704..d2777db8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
index 9f2e2c22..42b86647 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_j.glif b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
index c2fb07db..475bcda2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="806"/>
+  <advance width="801"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="525"/>
+    <component base="j" xOffset="520"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
index 5e81c75f..3d242082 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
index ae1f4987..5d8292cb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="525"/>
+  <advance width="520"/>
   <unicode hex="0141"/>
   <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 86d91050..6aa68005 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="1211"/>
+  <advance width="1203"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_.glif b/src/Cantarell-Bold.ufo/glyphs/P_.glif
index 404042f3..d85e64de 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="614"/>
+  <advance width="609"/>
   <unicode hex="0050"/>
   <note>
 P
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_.glif b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
index 92a1a6bf..50fc39c1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="758"/>
+  <advance width="756"/>
   <unicode hex="0051"/>
   <note>
 Q
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
index 79189740..8efb44f9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="758"/>
+  <advance width="756"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_.glif b/src/Cantarell-Bold.ufo/glyphs/R_.glif
index c900eefe..b9a48655 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0052"/>
   <note>
 R
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
index 1120243b..284b44d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
index c7293dc7..544a7014 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
index 8e8e8f1b..2399c8a8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
index 5d9dfb9c..a99e254a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
index 650305b4..1dceffe7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
index 6fd58c5a..423348d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
index 5a94ebc9..f3d6fa78 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="651"/>
+  <advance width="646"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_.glif b/src/Cantarell-Bold.ufo/glyphs/S_.glif
index 7dbb155e..74f23fb7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="291" y="0" name="bottom"/>
-  <anchor x="284" y="694" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="271" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="274" y="-10" type="curve" smooth="yes"/>
-      <point x="458" y="-10"/>
-      <point x="560" y="78"/>
-      <point x="560" y="217" type="curve" smooth="yes"/>
-      <point x="560" y="472"/>
-      <point x="217" y="395"/>
-      <point x="217" y="498" type="curve" smooth="yes"/>
-      <point x="217" y="533"/>
-      <point x="256" y="552"/>
-      <point x="324" y="552" type="curve" smooth="yes"/>
-      <point x="380" y="552"/>
-      <point x="442" y="542"/>
-      <point x="491" y="525" type="curve"/>
-      <point x="539" y="663" type="line"/>
-      <point x="481" y="689"/>
-      <point x="404" y="704"/>
-      <point x="333" y="704" type="curve" smooth="yes"/>
-      <point x="157" y="704"/>
-      <point x="37" y="612"/>
-      <point x="37" y="472" type="curve" smooth="yes"/>
-      <point x="37" y="236"/>
-      <point x="378" y="303"/>
-      <point x="378" y="196" type="curve" smooth="yes"/>
-      <point x="378" y="164"/>
-      <point x="348" y="146"/>
-      <point x="281" y="146" type="curve" smooth="yes"/>
-      <point x="218" y="146"/>
-      <point x="142" y="158"/>
-      <point x="73" y="187" type="curve"/>
-      <point x="25" y="45" type="line"/>
-      <point x="96" y="13"/>
-      <point x="188" y="-10"/>
+      <point x="261" y="-10" type="curve" smooth="yes"/>
+      <point x="445" y="-10"/>
+      <point x="547" y="78"/>
+      <point x="547" y="217" type="curve" smooth="yes"/>
+      <point x="547" y="472"/>
+      <point x="204" y="395"/>
+      <point x="204" y="498" type="curve" smooth="yes"/>
+      <point x="204" y="533"/>
+      <point x="243" y="552"/>
+      <point x="311" y="552" type="curve" smooth="yes"/>
+      <point x="367" y="552"/>
+      <point x="429" y="542"/>
+      <point x="478" y="525" type="curve"/>
+      <point x="526" y="663" type="line"/>
+      <point x="468" y="689"/>
+      <point x="391" y="704"/>
+      <point x="320" y="704" type="curve" smooth="yes"/>
+      <point x="144" y="704"/>
+      <point x="24" y="612"/>
+      <point x="24" y="472" type="curve" smooth="yes"/>
+      <point x="24" y="236"/>
+      <point x="365" y="303"/>
+      <point x="365" y="196" type="curve" smooth="yes"/>
+      <point x="365" y="164"/>
+      <point x="335" y="146"/>
+      <point x="268" y="146" type="curve" smooth="yes"/>
+      <point x="205" y="146"/>
+      <point x="129" y="158"/>
+      <point x="60" y="187" type="curve"/>
+      <point x="12" y="45" type="line"/>
+      <point x="83" y="13"/>
+      <point x="175" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_acute.glif b/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
index ba1622d6..04224e68 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="205"/>
+    <component base="acutecomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
index 965a11ef..4f6ff189 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="205"/>
-    <component base="dotaccentcomb.case" xOffset="42" yOffset="145"/>
+    <component base="acutecomb.case" xOffset="192"/>
+    <component base="dotaccentcomb.case" xOffset="29" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_caron.glif b/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
index afe1e229..ba012c7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="70"/>
+    <component base="caroncomb.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
index a110f196..26039563 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="70"/>
-    <component base="dotaccentcomb.case" xOffset="174" yOffset="194"/>
+    <component base="caroncomb.case" xOffset="57"/>
+    <component base="dotaccentcomb.case" xOffset="161" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
index a95bdf95..616cda09 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="133"/>
+    <component base="cedillacomb" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
index 81ea403b..80f7cc7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="85"/>
+    <component base="circumflexcomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
index ffd370e9..e4bc65c8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="173"/>
+    <component base="commaaccentcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
index 6dc1b529..045ebf3c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="139"/>
+    <component base="dotaccentcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
index 0ed8d610..28c6cef5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="141"/>
+    <component base="dotbelowcomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
index 09552a4b..fb4c2a4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="584"/>
+  <advance width="559"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="141"/>
-    <component base="dotaccentcomb.case" xOffset="139"/>
+    <component base="dotbelowcomb" xOffset="128"/>
+    <component base="dotaccentcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_.glif b/src/Cantarell-Bold.ufo/glyphs/T_.glif
index b95ac992..f9f8b946 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="310" y="327" name="center"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="306" y="0" name="bottom"/>
+  <anchor x="305" y="327" name="center"/>
+  <anchor x="304" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="224" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="394" y="660" type="line"/>
-      <point x="224" y="660" type="line"/>
+      <point x="219" y="0" type="line"/>
+      <point x="389" y="0" type="line"/>
+      <point x="389" y="660" type="line"/>
+      <point x="219" y="660" type="line"/>
     </contour>
     <contour>
-      <point x="10" y="542" type="line"/>
-      <point x="610" y="542" type="line"/>
-      <point x="610" y="694" type="line"/>
-      <point x="10" y="694" type="line"/>
+      <point x="5" y="542" type="line"/>
+      <point x="605" y="542" type="line"/>
+      <point x="605" y="694" type="line"/>
+      <point x="5" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_bar.glif b/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
index 4d1c4dc4..4b6ac42e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="95" yOffset="29"/>
+    <component base="strokeshortcomb.case" xOffset="90" yOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_caron.glif b/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
index 940dcd72..b9d38b2d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="95"/>
+    <component base="caroncomb.case" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
index 0b264c2a..81f97366 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="153"/>
+    <component base="cedillacomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
index 8cf78707..3cf5de5b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="193"/>
+    <component base="commaaccentcomb" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
index 686ac1ee..31421953 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="161"/>
+    <component base="dotbelowcomb" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
index c97d4180..feff2111 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Bold.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="620"/>
+  <advance width="610"/>
   <unicode hex="0422"/>
   <anchor x="600" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
index 4787c3d3..b4dbe787 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="620"/>
+  <advance width="610"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="66"/>
+    <component base="macronbelowcomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_.glif b/src/Cantarell-Bold.ufo/glyphs/U_.glif
index deedbeda..2d6ec36c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="355" y="0" name="bottom"/>
-  <anchor x="451" y="10" name="ogonek"/>
-  <anchor x="355" y="694" name="top"/>
-  <anchor x="658" y="694" name="topright"/>
+  <anchor x="349" y="0" name="bottom"/>
+  <anchor x="445" y="10" name="ogonek"/>
+  <anchor x="349" y="694" name="top"/>
+  <anchor x="652" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="347" y="-10" type="curve" smooth="yes"/>
-      <point x="536" y="-10"/>
-      <point x="658" y="107"/>
-      <point x="658" y="287" type="curve" smooth="yes"/>
-      <point x="658" y="694" type="line"/>
-      <point x="487" y="694" type="line"/>
-      <point x="487" y="267" type="line" smooth="yes"/>
-      <point x="487" y="187"/>
-      <point x="442" y="140"/>
-      <point x="366" y="140" type="curve" smooth="yes"/>
-      <point x="277" y="140"/>
-      <point x="225" y="195"/>
-      <point x="225" y="287" type="curve" smooth="yes"/>
-      <point x="225" y="694" type="line"/>
-      <point x="52" y="694" type="line"/>
-      <point x="52" y="277" type="line" smooth="yes"/>
-      <point x="52" y="98"/>
-      <point x="163" y="-10"/>
+      <point x="341" y="-10" type="curve" smooth="yes"/>
+      <point x="530" y="-10"/>
+      <point x="652" y="107"/>
+      <point x="652" y="287" type="curve" smooth="yes"/>
+      <point x="652" y="694" type="line"/>
+      <point x="481" y="694" type="line"/>
+      <point x="481" y="267" type="line" smooth="yes"/>
+      <point x="481" y="187"/>
+      <point x="436" y="140"/>
+      <point x="360" y="140" type="curve" smooth="yes"/>
+      <point x="271" y="140"/>
+      <point x="219" y="195"/>
+      <point x="219" y="287" type="curve" smooth="yes"/>
+      <point x="219" y="694" type="line"/>
+      <point x="46" y="694" type="line"/>
+      <point x="46" y="277" type="line" smooth="yes"/>
+      <point x="46" y="98"/>
+      <point x="157" y="-10"/>
     </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_acute.glif b/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
index 00f65304..7d71b05e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="276"/>
+    <component base="acutecomb.case" xOffset="270"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_breve.glif b/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
index f8f3f814..9f039770 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="122"/>
+    <component base="brevecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_caron.glif b/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
index 2e860918..39a202ad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="141"/>
+    <component base="caroncomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
index f504c45d..068a7756 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="156"/>
+    <component base="circumflexcomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
index 30922e43..d4600d70 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="72"/>
+    <component base="dblgravecomb.case" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
index e8df03ab..d7b448bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
index 8c5b901d..b307ec47 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="acutecomb.case" xOffset="276" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
+    <component base="acutecomb.case" xOffset="270" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
index 5ceb452d..20cd2045 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="caroncomb.case" xOffset="141" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
+    <component base="caroncomb.case" xOffset="135" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
index 1d266125..27cc490b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="gravecomb.case" xOffset="126" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
+    <component base="gravecomb.case" xOffset="120" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
index 0fc83996..9c80fdaf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="80"/>
-    <component base="macroncomb.case" xOffset="116" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="74"/>
+    <component base="macroncomb.case" xOffset="110" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
index 4e03d7ee..01cf56e5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="205"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_grave.glif b/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
index b62efd51..ff0ad74d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
index 7252b1fb..fcefa007 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="200"/>
+    <component base="hookabovecomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
index 9ecc9621..dc722108 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="587" yOffset="212"/>
+    <component base="horncomb" xOffset="581" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
index 88cf5dd6..9ee396d1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="276"/>
+    <component base="acutecomb.case" xOffset="270"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
index 3c14e9e2..653e243c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="205"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
index d479fb8d..35d78e29 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
index acdbdcd1..0dac413c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="200"/>
+    <component base="hookabovecomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
index a99c0456..6ab60040 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="874"/>
+  <advance width="863"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="126"/>
+    <component base="tildecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
index 83177950..49328eb9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="117"/>
+    <component base="hungarumlautcomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
index 55b253e7..991b6ed2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="124"/>
+    <component base="breveinvertedcomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macron.glif b/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
index 90d4581e..602efa7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="116"/>
+    <component base="macroncomb.case" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
index c7516073..30a8a81d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="116"/>
-    <component base="dieresiscomb.case" xOffset="80" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="110"/>
+    <component base="dieresiscomb.case" xOffset="74" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
index 8832a81c..a83cad08 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="-9"/>
+    <component base="ogonekcomb.tall.case" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_ring.glif b/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
index c61a8284..0bdd1a74 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="189"/>
+    <component base="ringcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
index 9058a6f9..a42fb008 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="126"/>
+    <component base="tildecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
index 727df6c6..fe022095 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="709"/>
+  <advance width="698"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="126"/>
-    <component base="acutecomb.case" xOffset="276" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="120"/>
+    <component base="acutecomb.case" xOffset="270" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
index c4482295..0847819d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="640"/>
+  <advance width="638"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_.glif b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
index 13ba417c..85579f50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="650"/>
+  <advance width="646"/>
   <unicode hex="005A"/>
   <note>
 Z
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif b/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
index 2471ec09..3a6f2e02 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="650"/>
+  <advance width="646"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
index 256b8039..16fc084c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="650"/>
+  <advance width="646"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
index 3cf7f45f..b6d83807 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="650"/>
+  <advance width="646"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
index fadc416e..bebc6fc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="650"/>
+  <advance width="646"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif b/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif
index 46660f7e..2970f0c4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/f_f_l.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_l" format="2">
-  <advance width="1076"/>
+  <advance width="1084"/>
   <outline>
     <component base="f_f"/>
     <component base="l" xOffset="766"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fl.glif b/src/Cantarell-Bold.ufo/glyphs/fl.glif
index c8660196..e8028d9f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="693"/>
+  <advance width="701"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/l.glif b/src/Cantarell-Bold.ufo/glyphs/l.glif
index 5da108a8..b0a4570d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/l.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/l.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="006C"/>
   <note>
 l
 </note>
-  <anchor x="168" y="0" name="bottom"/>
-  <anchor x="132" y="366" name="center"/>
-  <anchor x="310" y="363" name="periodcentered"/>
-  <anchor x="127" y="739" name="top"/>
-  <anchor x="325" y="490" name="topright"/>
+  <anchor x="176" y="0" name="bottom"/>
+  <anchor x="140" y="366" name="center"/>
+  <anchor x="323" y="363" name="periodcentered"/>
+  <anchor x="135" y="739" name="top"/>
+  <anchor x="333" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="208" y="-8" type="curve" smooth="yes"/>
-      <point x="245" y="-8"/>
-      <point x="284" y="-1"/>
-      <point x="317" y="11" type="curve"/>
-      <point x="283" y="125" type="line"/>
-      <point x="273" y="122"/>
-      <point x="262" y="121"/>
-      <point x="256" y="121" type="curve" smooth="yes"/>
-      <point x="230" y="121"/>
-      <point x="216" y="137"/>
-      <point x="216" y="168" type="curve" smooth="yes"/>
-      <point x="216" y="739" type="line"/>
-      <point x="46" y="739" type="line"/>
-      <point x="46" y="147" type="line" smooth="yes"/>
-      <point x="46" y="48"/>
-      <point x="105" y="-8"/>
+      <point x="216" y="-8" type="curve" smooth="yes"/>
+      <point x="253" y="-8"/>
+      <point x="292" y="-1"/>
+      <point x="325" y="11" type="curve"/>
+      <point x="291" y="125" type="line"/>
+      <point x="281" y="122"/>
+      <point x="270" y="121"/>
+      <point x="264" y="121" type="curve" smooth="yes"/>
+      <point x="238" y="121"/>
+      <point x="224" y="137"/>
+      <point x="224" y="168" type="curve" smooth="yes"/>
+      <point x="224" y="739" type="line"/>
+      <point x="54" y="739" type="line"/>
+      <point x="54" y="147" type="line" smooth="yes"/>
+      <point x="54" y="48"/>
+      <point x="113" y="-8"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lacute.glif b/src/Cantarell-Bold.ufo/glyphs/lacute.glif
index 280dd549..6a21421f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="48" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="56" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
index ad2f63b7..ec362861 100644
--- a/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Bold.ufo/glyphs/layerinfo.plist
@@ -1183,7 +1183,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.florin</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four</key>
-      <integer>5</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.four.numr</key>
@@ -1621,7 +1621,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>2</integer>
+      <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
@@ -1909,7 +1909,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.thorn</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three</key>
-      <integer>5</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.three.numr</key>
@@ -1959,7 +1959,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.tugrik</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two</key>
-      <integer>5</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.two.numr</key>
@@ -2131,7 +2131,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.zedieresis-cy</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero</key>
-      <integer>5</integer>
+      <integer>4</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.dnom</key>
       <integer>1</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.zero.numr</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lcaron.glif b/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
index 025a75fa..35655926 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="202" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="210" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
index 63d9320d..fef88386 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="50"/>
+    <component base="commaaccentcomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ldot.glif b/src/Cantarell-Bold.ufo/glyphs/ldot.glif
index d10084e1..a564c7e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="310" yOffset="8"/>
+    <component base="periodcentered.loclCAT" xOffset="323" yOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
index 062f2b56..7e94c32d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="18"/>
+    <component base="dotbelowcomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lj.glif b/src/Cantarell-Bold.ufo/glyphs/lj.glif
index 88dcdabd..ae2f0765 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="591"/>
+  <advance width="599"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="310"/>
+    <component base="j" xOffset="318"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
index e2217a76..aa591c3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-50"/>
+    <component base="macronbelowcomb.narrow" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lslash.glif b/src/Cantarell-Bold.ufo/glyphs/lslash.glif
index 288eec28..faf0e1ec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lslash.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="0142"/>
   <outline>
     <component base="l"/>
-    <component base="slashshortcomb" xOffset="-70" yOffset="119"/>
+    <component base="slashshortcomb" xOffset="-62" yOffset="119"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/t.glif b/src/Cantarell-Bold.ufo/glyphs/t.glif
index 57c0568c..c8ef310a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/t.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/t.glif
@@ -5,34 +5,34 @@
   <note>
 t
 </note>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="182" y="243" name="center"/>
-  <anchor x="161" y="631" name="top"/>
-  <anchor x="349" y="490" name="topright"/>
+  <anchor x="228" y="0" name="bottom"/>
+  <anchor x="185" y="243" name="center"/>
+  <anchor x="164" y="631" name="top"/>
+  <anchor x="352" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="274" y="-8" type="curve" smooth="yes"/>
-      <point x="308" y="-8"/>
-      <point x="346" y="-3"/>
-      <point x="385" y="8" type="curve"/>
-      <point x="352" y="130" type="line"/>
-      <point x="339" y="125"/>
-      <point x="325" y="123"/>
-      <point x="312" y="123" type="curve" smooth="yes"/>
-      <point x="270" y="123"/>
-      <point x="245" y="145"/>
-      <point x="245" y="181" type="curve" smooth="yes"/>
-      <point x="245" y="631" type="line"/>
-      <point x="75" y="631" type="line"/>
-      <point x="75" y="176" type="line" smooth="yes"/>
-      <point x="75" y="60"/>
-      <point x="147" y="-8"/>
+      <point x="277" y="-8" type="curve" smooth="yes"/>
+      <point x="311" y="-8"/>
+      <point x="349" y="-3"/>
+      <point x="388" y="8" type="curve"/>
+      <point x="355" y="130" type="line"/>
+      <point x="342" y="125"/>
+      <point x="328" y="123"/>
+      <point x="315" y="123" type="curve" smooth="yes"/>
+      <point x="273" y="123"/>
+      <point x="248" y="145"/>
+      <point x="248" y="181" type="curve" smooth="yes"/>
+      <point x="248" y="631" type="line"/>
+      <point x="78" y="631" type="line"/>
+      <point x="78" y="176" type="line" smooth="yes"/>
+      <point x="78" y="60"/>
+      <point x="150" y="-8"/>
     </contour>
     <contour>
-      <point x="5" y="355" type="line"/>
-      <point x="358" y="355" type="line"/>
-      <point x="358" y="490" type="line"/>
-      <point x="5" y="490" type="line"/>
+      <point x="8" y="355" type="line"/>
+      <point x="361" y="355" type="line"/>
+      <point x="361" y="490" type="line"/>
+      <point x="8" y="490" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tbar.glif b/src/Cantarell-Bold.ufo/glyphs/tbar.glif
index 18e908ee..4a01620b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tbar.glif
@@ -4,6 +4,6 @@
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-33" yOffset="-56"/>
+    <component base="strokeshortcomb" xOffset="-30" yOffset="-56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcaron.glif b/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
index 57ef2fc8..42866917 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="226" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="229" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif b/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
index edaed1ba..3c6dbd86 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcedilla.glif
@@ -4,6 +4,6 @@
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="67"/>
+    <component base="cedillacomb" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
index 35b645ea..d110ad3c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tcommaaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="107"/>
+    <component base="commaaccentcomb" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif b/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
index c43f1716..78198eac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-108" yOffset="141"/>
+    <component base="dieresiscomb" xOffset="-105" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
index 71901b4f..1378c552 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tdotbelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="75"/>
+    <component base="dotbelowcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif b/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
index 56850226..98f16084 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tlinebelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-20"/>
+    <component base="macronbelowcomb" xOffset="-17"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/v.glif b/src/Cantarell-Bold.ufo/glyphs/v.glif
index 07ebe52a..3f967f6c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/v.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/v.glif
@@ -19,4 +19,10 @@ v
       <point x="-8" y="490" 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 a06dd814..419a88f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/w.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/w.glif
@@ -27,4 +27,10 @@ w
       <point x="-8" y="490" 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/B_.glif b/src/Cantarell-Light.ufo/glyphs/B_.glif
index 4a7e85f2..08e5a32c 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="613"/>
+  <advance width="611"/>
   <unicode hex="0042"/>
   <note>
 B
diff --git a/src/Cantarell-Light.ufo/glyphs/C_.glif b/src/Cantarell-Light.ufo/glyphs/C_.glif
index cb744409..d9e7ba85 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="0043"/>
   <note>
 C
diff --git a/src/Cantarell-Light.ufo/glyphs/C_acute.glif b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
index 82b62086..b1d36e8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_caron.glif b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
index 50fcc04c..447aaef0 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
index 41f7e250..60b9fd12 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
index 0a714f66..6556c70e 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
index 521476d9..8728c95d 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
index edf47f90..e6e0bd8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
index 7f4a0d88..fefab2d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1295"/>
+  <advance width="1267"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
index 0554b26b..7a157a8d 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Light.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="569"/>
+  <advance width="553"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index 5e6b7941..07c3d0e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0045"/>
   <note>
 E
diff --git a/src/Cantarell-Light.ufo/glyphs/E_acute.glif b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
index cb0fd35d..d395b957 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_breve.glif b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
index 7830f081..939d3137 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_caron.glif b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
index 8402a3c2..3b012d95 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
index b04fa77e..9ca16f69 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
index 33d49ec5..8ba0204a 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index f051188b..c45f1597 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
index ca143cd8..067482da 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index 88db55df..c31c72d5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
index 18a5d574..8dfd58d2 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
index a8a681f7..975f4890 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
index 1099193c..586371ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
index 4298f314..ee5553b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
index 098f9be1..b28f77b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
index 6d31d069..b2a68fb5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_grave.glif b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
index d051c0d8..e71b5e75 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
index 2d7e39d7..5159a92b 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
index de4ae2b8..fa03d336 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macron.glif b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
index 9253c199..48adbbde 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
index 421a343f..254456ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
index 90ac7d74..efaeb087 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
index 4493236d..d6b9eccf 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0118"/>
   <anchor x="285" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
index 380e56ae..333bf76e 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="566"/>
+  <advance width="556"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
index a4dd0c8c..7ae9e302 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="0421"/>
   <anchor x="371" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
index 686df78f..d2d703c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="640"/>
+  <advance width="643"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
index bcc1eb9a..f4142307 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index e00b310f..79d7a764 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="535"/>
+  <advance width="533"/>
   <unicode hex="0046"/>
   <note>
 F
diff --git a/src/Cantarell-Light.ufo/glyphs/G_.glif b/src/Cantarell-Light.ufo/glyphs/G_.glif
index dd1e03e2..5043e8a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="0047"/>
   <note>
 G
diff --git a/src/Cantarell-Light.ufo/glyphs/G_breve.glif b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
index d2928f67..eb3b557d 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_caron.glif b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
index 40a794aa..81df26d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
index d8e30c4f..93cb7ab2 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
index 8aa3a1f9..c11c4f17 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
index 840c0934..294cdcd4 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_macron.glif b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
index d8d9d96c..024086fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="709"/>
+  <advance width="703"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
index d001e852..a3112b03 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="593"/>
+  <advance width="555"/>
   <unicode hex="0425"/>
   <anchor x="560" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
index be4f2b32..562ae79c 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0415"/>
   <anchor x="277" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
index c373e550..44593b86 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
index 8ea85a1e..ced2648a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
index b11df06b..7b805158 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="547"/>
+  <advance width="552"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_.glif b/src/Cantarell-Light.ufo/glyphs/J_.glif
index 2eb87669..9fa079f4 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="398"/>
+  <advance width="370"/>
   <unicode hex="004A"/>
   <note>
 J
 </note>
-  <anchor x="257" y="0" name="bottom"/>
-  <anchor x="282" y="694" name="top"/>
+  <anchor x="242" y="0" name="bottom"/>
+  <anchor x="267" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="146" y="-10" type="curve" smooth="yes"/>
-      <point x="237" y="-10"/>
-      <point x="293" y="54"/>
-      <point x="293" y="158" type="curve" smooth="yes"/>
-      <point x="293" y="694" type="line"/>
-      <point x="272" y="694" type="line"/>
-      <point x="272" y="154" type="line" smooth="yes"/>
-      <point x="272" y="63"/>
-      <point x="226" y="9"/>
-      <point x="149" y="9" type="curve" smooth="yes"/>
-      <point x="116" y="9"/>
-      <point x="78" y="19"/>
-      <point x="48" y="36" type="curve"/>
-      <point x="40" y="19" type="line"/>
-      <point x="69" y="1"/>
-      <point x="108" y="-10"/>
+      <point x="131" y="-10" type="curve" smooth="yes"/>
+      <point x="222" y="-10"/>
+      <point x="278" y="54"/>
+      <point x="278" y="158" type="curve" smooth="yes"/>
+      <point x="278" y="694" type="line"/>
+      <point x="257" y="694" type="line"/>
+      <point x="257" y="154" type="line" smooth="yes"/>
+      <point x="257" y="63"/>
+      <point x="211" y="9"/>
+      <point x="134" y="9" type="curve" smooth="yes"/>
+      <point x="101" y="9"/>
+      <point x="63" y="19"/>
+      <point x="33" y="36" type="curve"/>
+      <point x="25" y="19" type="line"/>
+      <point x="54" y="1"/>
+      <point x="93" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_acute.glif b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
index 010ff26b..37cc1c3b 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="398"/>
+  <advance width="370"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="224"/>
+    <component base="acutecomb.case" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
index 08e8e120..323b4be2 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="398"/>
+  <advance width="370"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="105"/>
+    <component base="circumflexcomb.case" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
index 1b397dca..7b237716 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="398"/>
+  <advance width="370"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_.glif b/src/Cantarell-Light.ufo/glyphs/K_.glif
index be3221eb..29aa9abc 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="546"/>
+  <advance width="541"/>
   <unicode hex="004B"/>
   <note>
 K
diff --git a/src/Cantarell-Light.ufo/glyphs/K_acute.glif b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
index 614f39cd..b86d0ac4 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="546"/>
+  <advance width="541"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
index ea0a6362..14fe115f 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="546"/>
+  <advance width="541"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_.glif b/src/Cantarell-Light.ufo/glyphs/L_.glif
index 334960be..e8dd623b 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="004C"/>
   <note>
 L
diff --git a/src/Cantarell-Light.ufo/glyphs/L_J_.glif b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
index 369147f7..27583484 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="887"/>
+  <advance width="840"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="489"/>
+    <component base="J" xOffset="470"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_acute.glif b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
index 084479b9..b400ff1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_caron.glif b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
index a78e5fba..f341a4c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
index 923cf229..325e9898 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dot.glif b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
index 3b87ebca..f0f5caf2 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
index 35da9fa4..cb566e70 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_j.glif b/src/Cantarell-Light.ufo/glyphs/L_j.glif
index 876d5c3d..cacaada0 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="686"/>
+  <advance width="667"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="489"/>
+    <component base="j" xOffset="470"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
index fdf0a81f..66cafb73 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_slash.glif b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
index 3cb72b56..20fcb3d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="489"/>
+  <advance width="470"/>
   <unicode hex="0141"/>
   <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 2758b77a..0bff69da 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="1118"/>
+  <advance width="1090"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index c27aed32..2d3ab18c 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="566"/>
+  <advance width="556"/>
   <unicode hex="0050"/>
   <note>
 P
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_.glif b/src/Cantarell-Light.ufo/glyphs/Q_.glif
index 0b09116f..a2b5a838 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="747"/>
+  <advance width="741"/>
   <unicode hex="0051"/>
   <note>
 Q
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
index 0a44622e..c292186f 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="747"/>
+  <advance width="741"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_.glif b/src/Cantarell-Light.ufo/glyphs/R_.glif
index 74bf49ab..31ed8e81 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0052"/>
   <note>
 R
diff --git a/src/Cantarell-Light.ufo/glyphs/R_acute.glif b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
index a2cabbf1..ccde286b 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_caron.glif b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
index 32f437d2..858eee2f 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
index 6619bcfd..8b8ae3f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
index 8a3c61bb..855ef663 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
index 6adb6cc5..6bbbd8ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
index 1ff9f11d..020f96f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
index be28fd90..e8d79346 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="600"/>
+  <advance width="593"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_.glif b/src/Cantarell-Light.ufo/glyphs/S_.glif
index 0fbee642..1ec2cafc 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="277" y="0" name="bottom"/>
-  <anchor x="282" y="694" name="top"/>
+  <anchor x="270" y="0" name="bottom"/>
+  <anchor x="275" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="277" y="-10" type="curve" smooth="yes"/>
-      <point x="420" y="-10"/>
-      <point x="510" y="66"/>
-      <point x="510" y="177" type="curve" smooth="yes"/>
-      <point x="510" y="416"/>
-      <point x="91" y="307"/>
-      <point x="91" y="531" type="curve" smooth="yes"/>
-      <point x="91" y="627"/>
-      <point x="167" y="683"/>
-      <point x="297" y="683" type="curve" smooth="yes"/>
-      <point x="357" y="683"/>
-      <point x="418" y="671"/>
-      <point x="471" y="645" type="curve"/>
-      <point x="478" y="663" type="line"/>
-      <point x="425" y="691"/>
-      <point x="362" y="702"/>
-      <point x="303" y="702" type="curve" smooth="yes"/>
-      <point x="157" y="702"/>
-      <point x="69" y="636"/>
-      <point x="69" y="527" type="curve" smooth="yes"/>
-      <point x="69" y="290"/>
-      <point x="488" y="394"/>
-      <point x="488" y="172" type="curve" smooth="yes"/>
-      <point x="488" y="75"/>
-      <point x="409" y="9"/>
-      <point x="282" y="9" type="curve" smooth="yes"/>
-      <point x="215" y="9"/>
-      <point x="140" y="27"/>
-      <point x="68" y="60" type="curve"/>
-      <point x="61" y="41" type="line"/>
-      <point x="130" y="8"/>
-      <point x="208" y="-10"/>
+      <point x="270" y="-10" type="curve" smooth="yes"/>
+      <point x="413" y="-10"/>
+      <point x="503" y="66"/>
+      <point x="503" y="177" type="curve" smooth="yes"/>
+      <point x="503" y="416"/>
+      <point x="84" y="307"/>
+      <point x="84" y="531" type="curve" smooth="yes"/>
+      <point x="84" y="627"/>
+      <point x="160" y="683"/>
+      <point x="290" y="683" type="curve" smooth="yes"/>
+      <point x="350" y="683"/>
+      <point x="411" y="671"/>
+      <point x="464" y="645" type="curve"/>
+      <point x="471" y="663" type="line"/>
+      <point x="418" y="691"/>
+      <point x="355" y="702"/>
+      <point x="296" y="702" type="curve" smooth="yes"/>
+      <point x="150" y="702"/>
+      <point x="62" y="636"/>
+      <point x="62" y="527" type="curve" smooth="yes"/>
+      <point x="62" y="290"/>
+      <point x="481" y="394"/>
+      <point x="481" y="172" type="curve" smooth="yes"/>
+      <point x="481" y="75"/>
+      <point x="402" y="9"/>
+      <point x="275" y="9" type="curve" smooth="yes"/>
+      <point x="208" y="9"/>
+      <point x="133" y="27"/>
+      <point x="61" y="60" type="curve"/>
+      <point x="54" y="41" type="line"/>
+      <point x="123" y="8"/>
+      <point x="201" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acute.glif b/src/Cantarell-Light.ufo/glyphs/S_acute.glif
index f1c6adeb..b1e699e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="224"/>
+    <component base="acutecomb.case" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
index 3312e1a6..b6baf5da 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="224"/>
-    <component base="dotaccentcomb.case" xOffset="158" yOffset="70"/>
+    <component base="acutecomb.case" xOffset="217"/>
+    <component base="dotaccentcomb.case" xOffset="151" yOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_caron.glif b/src/Cantarell-Light.ufo/glyphs/S_caron.glif
index 9da2da4d..4074cc40 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="107"/>
+    <component base="caroncomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
index b772566e..4c7cf598 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="107"/>
-    <component base="dotaccentcomb.case" xOffset="163" yOffset="109"/>
+    <component base="caroncomb.case" xOffset="100"/>
+    <component base="dotaccentcomb.case" xOffset="156" yOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
index 163ebf90..8fc1a734 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="152"/>
+    <component base="cedillacomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
index 73d5c01f..a621e59e 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="105"/>
+    <component base="circumflexcomb.case" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
index ac6c29b0..e12cd4dc 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="148"/>
+    <component base="commaaccentcomb" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
index 3349b24d..a40b24a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="163"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
index fe9fbd57..ab660ab1 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="157"/>
+    <component base="dotbelowcomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
index 8b5a58f2..c33df8fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="569"/>
+  <advance width="553"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="157"/>
-    <component base="dotaccentcomb.case" xOffset="163"/>
+    <component base="dotbelowcomb" xOffset="150"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_.glif b/src/Cantarell-Light.ufo/glyphs/T_.glif
index bf2f59eb..d6862167 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="292" y="0" name="bottom"/>
-  <anchor x="295" y="357" name="center"/>
-  <anchor x="295" y="694" name="top"/>
+  <anchor x="253" y="0" name="bottom"/>
+  <anchor x="256" y="357" name="center"/>
+  <anchor x="256" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="284" y="0" type="line"/>
-      <point x="305" y="0" type="line"/>
-      <point x="305" y="694" type="line"/>
-      <point x="284" y="694" type="line"/>
+      <point x="245" y="0" type="line"/>
+      <point x="266" y="0" type="line"/>
+      <point x="266" y="694" type="line"/>
+      <point x="245" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="39" y="676" type="line"/>
-      <point x="550" y="676" type="line"/>
-      <point x="550" y="694" type="line"/>
-      <point x="39" y="694" type="line"/>
+      <point x="0" y="676" type="line"/>
+      <point x="511" y="676" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="0" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_bar.glif b/src/Cantarell-Light.ufo/glyphs/T_bar.glif
index f247c3b0..b7fb625f 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="54" yOffset="58"/>
+    <component base="strokeshortcomb.case" xOffset="15" yOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_caron.glif b/src/Cantarell-Light.ufo/glyphs/T_caron.glif
index 5b0f03a6..2f74ed6c 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="120"/>
+    <component base="caroncomb.case" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
index 41670fff..074b4f7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="167"/>
+    <component base="cedillacomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
index 29204a36..450ea7d9 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="163"/>
+    <component base="commaaccentcomb" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
index a13b2c25..f38daff5 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="172"/>
+    <component base="dotbelowcomb" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
index 96ab8c3e..eda5c06f 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Light.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="589"/>
+  <advance width="511"/>
   <unicode hex="0422"/>
   <anchor x="569" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
index 8c2d37f1..723420ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="589"/>
+  <advance width="511"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="42"/>
+    <component base="macronbelowcomb" xOffset="3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_.glif b/src/Cantarell-Light.ufo/glyphs/U_.glif
index 6bd0b9e3..3056f2b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="338" y="0" name="bottom"/>
-  <anchor x="420" y="10" name="ogonek"/>
-  <anchor x="338" y="694" name="top"/>
-  <anchor x="635" y="694" name="topright"/>
+  <anchor x="323" y="0" name="bottom"/>
+  <anchor x="405" y="10" name="ogonek"/>
+  <anchor x="323" y="694" name="top"/>
+  <anchor x="620" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="337" y="-10" type="curve" smooth="yes"/>
-      <point x="486" y="-10"/>
-      <point x="574" y="85"/>
-      <point x="574" y="246" type="curve" smooth="yes"/>
-      <point x="574" y="694" type="line"/>
-      <point x="553" y="694" type="line"/>
-      <point x="553" y="246" type="line" smooth="yes"/>
-      <point x="553" y="97"/>
-      <point x="474" y="9"/>
-      <point x="340" y="9" type="curve" smooth="yes"/>
-      <point x="202" y="9"/>
-      <point x="121" y="97"/>
-      <point x="121" y="246" type="curve" smooth="yes"/>
-      <point x="121" y="694" type="line"/>
-      <point x="99" y="694" type="line"/>
-      <point x="99" y="246" type="line" smooth="yes"/>
-      <point x="99" y="85"/>
-      <point x="187" y="-10"/>
+      <point x="322" y="-10" type="curve" smooth="yes"/>
+      <point x="471" y="-10"/>
+      <point x="559" y="85"/>
+      <point x="559" y="246" type="curve" smooth="yes"/>
+      <point x="559" y="694" type="line"/>
+      <point x="538" y="694" type="line"/>
+      <point x="538" y="246" type="line" smooth="yes"/>
+      <point x="538" y="97"/>
+      <point x="459" y="9"/>
+      <point x="325" y="9" type="curve" smooth="yes"/>
+      <point x="187" y="9"/>
+      <point x="106" y="97"/>
+      <point x="106" y="246" type="curve" smooth="yes"/>
+      <point x="106" y="694" type="line"/>
+      <point x="84" y="694" type="line"/>
+      <point x="84" y="246" type="line" smooth="yes"/>
+      <point x="84" y="85"/>
+      <point x="172" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_acute.glif b/src/Cantarell-Light.ufo/glyphs/U_acute.glif
index 23d16358..af21ea34 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="280"/>
+    <component base="acutecomb.case" xOffset="265"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_breve.glif b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
index 2391e4e9..39934974 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="135"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_caron.glif b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
index 1b3ed7aa..655ba6fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="163"/>
+    <component base="caroncomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
index 19a4d0ce..d40c543a 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="161"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
index 675a3d13..ea7fa56c 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="95"/>
+    <component base="dblgravecomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
index daa37c37..02410459 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
index f3920790..83f472b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="acutecomb.case" xOffset="280" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="acutecomb.case" xOffset="265" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
index a65e923a..0983b88b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="caroncomb.case" xOffset="163" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="caroncomb.case" xOffset="148" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
index f9724a2f..9670c1c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="gravecomb.case" xOffset="141" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="gravecomb.case" xOffset="126" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
index fb244bb7..5487a290 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="118"/>
-    <component base="macroncomb.case" xOffset="100" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="macroncomb.case" xOffset="85" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
index 15758b9c..64dab87b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="218"/>
+    <component base="dotbelowcomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_grave.glif b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
index 6aee26e6..9490e4c8 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="141"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
index 3f2ad0e0..2a7ef842 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="183"/>
+    <component base="hookabovecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horn.glif b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
index c7fa2b81..01fd04a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="503" yOffset="212"/>
+    <component base="horncomb" xOffset="488" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif b/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
index 1e4be7dd..36f978ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="280"/>
+    <component base="acutecomb.case" xOffset="265"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
index b37f2506..9405a622 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="218"/>
+    <component base="dotbelowcomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
index 19bc7368..fe4ed777 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="141"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
index 28eb4e1a..409f47e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="183"/>
+    <component base="hookabovecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
index 6d9d3b6c..bb32150d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="745"/>
+  <advance width="715"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="94"/>
+    <component base="tildecomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
index 190387db..532cb41b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="166"/>
+    <component base="hungarumlautcomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
index 9986ded1..c406a94d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="132"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron.glif b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
index 06eaa796..62244ae7 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="100"/>
+    <component base="macroncomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
index 0be87762..3846b242 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="100"/>
-    <component base="dieresiscomb.case" xOffset="118" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="85"/>
+    <component base="dieresiscomb.case" xOffset="103" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
index 9e39cfa8..3db728b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="19"/>
+    <component base="ogonekcomb.tall.case" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ring.glif b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
index cde327e3..d1f52ac6 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="164"/>
+    <component base="ringcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
index 3f70c6ec..fd51d98d 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Light.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="528"/>
+  <advance width="518"/>
   <unicode hex="04AE"/>
   <anchor x="264" y="326" name="center"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
index 0bec3b75..7d74d0fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Light.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="528"/>
+  <advance width="518"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tilde.glif b/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
index 7ea754bf..01b5cd0b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="94"/>
+    <component base="tildecomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
index ed491ab3..2e3f05cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="673"/>
+  <advance width="643"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="94"/>
-    <component base="acutecomb.case" xOffset="280" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="79"/>
+    <component base="acutecomb.case" xOffset="265" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_.glif b/src/Cantarell-Light.ufo/glyphs/V_.glif
index 72e60ebc..88e03f95 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="603"/>
+  <advance width="563"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="302" y="0" name="bottom"/>
-  <anchor x="302" y="694" name="top"/>
+  <anchor x="282" y="0" name="bottom"/>
+  <anchor x="282" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="297" y="0" type="line"/>
-      <point x="308" y="0" type="line"/>
-      <point x="565" y="694" type="line"/>
-      <point x="544" y="694" type="line"/>
-      <point x="299" y="30" type="line"/>
-      <point x="308" y="30" type="line"/>
-      <point x="61" y="694" type="line"/>
-      <point x="38" y="694" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="288" y="0" type="line"/>
+      <point x="545" y="694" type="line"/>
+      <point x="524" y="694" type="line"/>
+      <point x="279" y="30" type="line"/>
+      <point x="288" y="30" type="line"/>
+      <point x="41" y="694" type="line"/>
+      <point x="18" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
index dfc203d9..2f07fbfd 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="613"/>
+  <advance width="611"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_.glif b/src/Cantarell-Light.ufo/glyphs/W_.glif
index 1934362b..87107914 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="985"/>
+  <advance width="943"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="494" y="0" name="bottom"/>
-  <anchor x="494" y="694" name="top"/>
+  <anchor x="473" y="0" name="bottom"/>
+  <anchor x="473" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="266" y="0" type="line"/>
-      <point x="278" y="0" type="line"/>
-      <point x="502" y="666" type="line"/>
-      <point x="488" y="666" type="line"/>
-      <point x="719" y="0" type="line"/>
-      <point x="732" y="0" type="line"/>
-      <point x="944" y="694" type="line"/>
+      <point x="245" y="0" type="line"/>
+      <point x="257" y="0" type="line"/>
+      <point x="481" y="666" type="line"/>
+      <point x="467" y="666" type="line"/>
+      <point x="698" y="0" type="line"/>
+      <point x="711" y="0" type="line"/>
       <point x="923" y="694" type="line"/>
-      <point x="722" y="32" type="line"/>
-      <point x="730" y="32" type="line"/>
-      <point x="502" y="688" type="line"/>
-      <point x="489" y="688" type="line"/>
-      <point x="269" y="32" type="line"/>
-      <point x="277" y="32" type="line"/>
-      <point x="64" y="694" type="line"/>
-      <point x="41" y="694" type="line"/>
+      <point x="902" y="694" type="line"/>
+      <point x="701" y="32" type="line"/>
+      <point x="709" y="32" type="line"/>
+      <point x="481" y="688" type="line"/>
+      <point x="468" y="688" type="line"/>
+      <point x="248" y="32" type="line"/>
+      <point x="256" y="32" type="line"/>
+      <point x="43" y="694" type="line"/>
+      <point x="20" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_acute.glif b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
index 28defc27..8bf8e967 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="985"/>
+  <advance width="943"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="436"/>
+    <component base="acutecomb.case" xOffset="415"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
index dccacc7b..febe221b 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="985"/>
+  <advance width="943"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="317"/>
+    <component base="circumflexcomb.case" xOffset="296"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
index 5ab0998a..b3189669 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="985"/>
+  <advance width="943"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="274"/>
+    <component base="dieresiscomb.case" xOffset="253"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/W_e-cy.glif
index 01dde5d7..f246f52e 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="985"/>
+  <advance width="943"/>
   <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 e08d7823..4cb15975 100644
--- a/src/Cantarell-Light.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="985"/>
+  <advance width="943"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="297"/>
+    <component base="gravecomb.case" xOffset="276"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_.glif b/src/Cantarell-Light.ufo/glyphs/X_.glif
index c8688c96..d76badf1 100644
--- a/src/Cantarell-Light.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/X_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="593"/>
+  <advance width="555"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="299" y="0" name="bottom"/>
-  <anchor x="299" y="694" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="531" y="0" type="line"/>
-      <point x="558" y="0" type="line"/>
-      <point x="291" y="385" type="line"/>
-      <point x="91" y="694" type="line"/>
-      <point x="64" y="694" type="line"/>
-      <point x="278" y="369" type="line"/>
+      <point x="512" y="0" type="line"/>
+      <point x="539" y="0" type="line"/>
+      <point x="272" y="385" type="line"/>
+      <point x="72" y="694" type="line"/>
+      <point x="45" y="694" type="line"/>
+      <point x="259" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="35" y="0" type="line"/>
-      <point x="59" y="0" type="line"/>
-      <point x="296" y="351" type="line"/>
-      <point x="285" y="367" type="line"/>
+      <point x="16" y="0" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="277" y="351" type="line"/>
+      <point x="266" y="367" type="line"/>
     </contour>
     <contour>
-      <point x="304" y="358" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="514" y="694" type="line"/>
-      <point x="293" y="375" type="line"/>
+      <point x="285" y="358" type="line"/>
+      <point x="519" y="694" type="line"/>
+      <point x="495" y="694" type="line"/>
+      <point x="274" y="375" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_.glif b/src/Cantarell-Light.ufo/glyphs/Y_.glif
index d09bbc0c..119500c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="269" y="0" name="bottom"/>
-  <anchor x="269" y="694" name="top"/>
-  <anchor x="3" y="694" name="topleft"/>
+  <anchor x="264" y="0" name="bottom"/>
+  <anchor x="264" y="694" name="top"/>
+  <anchor x="-2" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="254" y="0" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="275" y="333" type="line"/>
-      <point x="507" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
-      <point x="262" y="344" type="line"/>
-      <point x="270" y="344" type="line"/>
-      <point x="47" y="694" type="line"/>
-      <point x="21" y="694" type="line"/>
-      <point x="254" y="333" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="270" y="0" type="line"/>
+      <point x="270" y="333" type="line"/>
+      <point x="502" y="694" type="line"/>
+      <point x="479" y="694" type="line"/>
+      <point x="257" y="344" type="line"/>
+      <point x="265" y="344" type="line"/>
+      <point x="42" y="694" type="line"/>
+      <point x="16" y="694" type="line"/>
+      <point x="249" y="333" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
index 5cbb74d1..1e03a262 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="211"/>
+    <component base="acutecomb.case" xOffset="206"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
index 8d918466..787a4591 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="92"/>
+    <component base="circumflexcomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
index ed856b68..20dd23a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="49"/>
+    <component base="dieresiscomb.case" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
index 643b3a95..08c291b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="150"/>
+    <component base="dotaccentcomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
index ff90ac2a..ed34e3f1 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
index cdd7cd5c..3cc38a4e 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="72"/>
+    <component base="gravecomb.case" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
index fe2ffdeb..32944445 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="114"/>
+    <component base="hookabovecomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
index 8df39672..e2b0c9ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="31"/>
+    <component base="macroncomb.case" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
index 99020eb5..1495017d 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="528"/>
+  <advance width="518"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="25"/>
+    <component base="tildecomb.case" xOffset="20"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_.glif b/src/Cantarell-Light.ufo/glyphs/Z_.glif
index 651d51d2..cbf269d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="616"/>
+  <advance width="588"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="298" y="0" name="bottom"/>
-  <anchor x="298" y="694" name="top"/>
+  <anchor x="284" y="0" name="bottom"/>
+  <anchor x="284" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="572" y="0" type="line"/>
-      <point x="572" y="18" type="line"/>
-      <point x="66" y="18" type="line"/>
-      <point x="66" y="12" type="line"/>
-      <point x="555" y="677" type="line"/>
-      <point x="555" y="694" type="line"/>
-      <point x="62" y="694" type="line"/>
-      <point x="62" y="676" type="line"/>
-      <point x="533" y="676" type="line"/>
-      <point x="533" y="682" type="line"/>
-      <point x="44" y="16" type="line"/>
+      <point x="30" y="0" type="line"/>
+      <point x="558" y="0" type="line"/>
+      <point x="558" y="18" type="line"/>
+      <point x="52" y="18" type="line"/>
+      <point x="52" y="12" type="line"/>
+      <point x="541" y="677" type="line"/>
+      <point x="541" y="694" type="line"/>
+      <point x="48" y="694" type="line"/>
+      <point x="48" y="676" type="line"/>
+      <point x="519" y="676" type="line"/>
+      <point x="519" y="682" type="line"/>
+      <point x="30" y="16" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_acute.glif b/src/Cantarell-Light.ufo/glyphs/Z_acute.glif
index bed08736..c7900642 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="616"/>
+  <advance width="588"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="240"/>
+    <component base="acutecomb.case" xOffset="226"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/Z_caron.glif
index f2333b73..9831df4f 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="616"/>
+  <advance width="588"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="123"/>
+    <component base="caroncomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif
index 166ce2cb..637fb9f5 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="616"/>
+  <advance width="588"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="179"/>
+    <component base="dotaccentcomb.case" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif
index 5ea3cb53..802cebdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="616"/>
+  <advance width="588"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="dotbelowcomb" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/c.glif b/src/Cantarell-Light.ufo/glyphs/c.glif
index 78162514..c94935bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/c.glif
+++ b/src/Cantarell-Light.ufo/glyphs/c.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="c" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="0063"/>
   <note>
 c
diff --git a/src/Cantarell-Light.ufo/glyphs/cacute.glif b/src/Cantarell-Light.ufo/glyphs/cacute.glif
index 4feab123..931571f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccaron.glif b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
index 4b9220d6..404549da 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
index bab05cb2..287132fb 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
index 816610dc..9ca1f3bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
index ffc3adba..02268ce0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
index 16b93abe..12e0fc1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/es-cy.glif b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
index 353469d4..0baa9368 100644
--- a/src/Cantarell-Light.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="0441"/>
   <anchor x="248" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
index c8f47b4a..078fcdaa 100644
--- a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="430"/>
+  <advance width="446"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/f_f_l.glif b/src/Cantarell-Light.ufo/glyphs/f_f_l.glif
index bb7a11e8..1062465a 100644
--- a/src/Cantarell-Light.ufo/glyphs/f_f_l.glif
+++ b/src/Cantarell-Light.ufo/glyphs/f_f_l.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_l" format="2">
-  <advance width="822"/>
+  <advance width="824"/>
   <outline>
     <component base="f_f"/>
     <component base="l" xOffset="590"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fl.glif b/src/Cantarell-Light.ufo/glyphs/fl.glif
index d545e13c..198e85c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="527"/>
+  <advance width="529"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.glif b/src/Cantarell-Light.ufo/glyphs/l.glif
index f1ebef46..003f64d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="006C"/>
   <note>
 l
 </note>
-  <anchor x="136" y="0" name="bottom"/>
-  <anchor x="119" y="383" name="center"/>
-  <anchor x="238" y="353" name="periodcentered"/>
-  <anchor x="97" y="739" name="top"/>
-  <anchor x="209" y="480" name="topright"/>
+  <anchor x="138" y="0" name="bottom"/>
+  <anchor x="121" y="383" name="center"/>
+  <anchor x="230" y="353" name="periodcentered"/>
+  <anchor x="99" y="739" name="top"/>
+  <anchor x="211" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="163" y="-2" type="curve" smooth="yes"/>
-      <point x="180" y="-2"/>
-      <point x="198" y="2"/>
-      <point x="212" y="8" type="curve"/>
-      <point x="207" y="22" type="line"/>
-      <point x="196" y="17"/>
-      <point x="181" y="14"/>
-      <point x="168" y="14" type="curve" smooth="yes"/>
-      <point x="129" y="14"/>
-      <point x="106" y="43"/>
-      <point x="106" y="87" type="curve" smooth="yes"/>
-      <point x="106" y="739" type="line"/>
-      <point x="86" y="739" type="line"/>
-      <point x="86" y="83" type="line" smooth="yes"/>
-      <point x="86" y="31"/>
-      <point x="115" y="-2"/>
+      <point x="165" y="-2" type="curve" smooth="yes"/>
+      <point x="182" y="-2"/>
+      <point x="200" y="2"/>
+      <point x="214" y="8" type="curve"/>
+      <point x="209" y="22" type="line"/>
+      <point x="198" y="17"/>
+      <point x="183" y="14"/>
+      <point x="170" y="14" type="curve" smooth="yes"/>
+      <point x="131" y="14"/>
+      <point x="108" y="43"/>
+      <point x="108" y="87" type="curve" smooth="yes"/>
+      <point x="108" y="739" type="line"/>
+      <point x="88" y="739" type="line"/>
+      <point x="88" y="83" type="line" smooth="yes"/>
+      <point x="88" y="31"/>
+      <point x="117" y="-2"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lacute.glif b/src/Cantarell-Light.ufo/glyphs/lacute.glif
index cd56c153..5411b79e 100644
--- a/src/Cantarell-Light.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="39" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="41" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 0ab55a36..5701e8fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -1621,7 +1621,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>0</integer>
+      <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcaron.glif b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
index 1dffc629..16ddc672 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="97"/>
+    <component base="caroncomb.alt" xOffset="99"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
index 2e90e9bc..f6d9b774 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="7"/>
+    <component base="commaaccentcomb" xOffset="9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldot.glif b/src/Cantarell-Light.ufo/glyphs/ldot.glif
index 7a6df3be..57702e99 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="238"/>
+    <component base="periodcentered.loclCAT" xOffset="230"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
index 92d0d71c..fd57e043 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="16"/>
+    <component base="dotbelowcomb" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lj.glif b/src/Cantarell-Light.ufo/glyphs/lj.glif
index 74e82bbb..bd8e7123 100644
--- a/src/Cantarell-Light.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="429"/>
+  <advance width="431"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="232"/>
+    <component base="j" xOffset="234"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
index b5b53ace..a8899ea5 100644
--- a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-85"/>
+    <component base="macronbelowcomb.narrow" xOffset="-83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lslash.glif b/src/Cantarell-Light.ufo/glyphs/lslash.glif
index 60ab54e8..8a7bcb21 100644
--- a/src/Cantarell-Light.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lslash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="232"/>
+  <advance width="234"/>
   <unicode hex="0142"/>
   <outline>
     <component base="l"/>
-    <component base="slashshortcomb" xOffset="-83" yOffset="87"/>
+    <component base="slashshortcomb" xOffset="-81" yOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/t.glif b/src/Cantarell-Light.ufo/glyphs/t.glif
index 048a6204..d7d2f600 100644
--- a/src/Cantarell-Light.ufo/glyphs/t.glif
+++ b/src/Cantarell-Light.ufo/glyphs/t.glif
@@ -5,34 +5,34 @@
   <note>
 t
 </note>
-  <anchor x="169" y="0" name="bottom"/>
-  <anchor x="145" y="250" name="center"/>
-  <anchor x="103" y="617" name="top"/>
-  <anchor x="219" y="480" name="topright"/>
+  <anchor x="170" y="0" name="bottom"/>
+  <anchor x="146" y="250" name="center"/>
+  <anchor x="104" y="617" name="top"/>
+  <anchor x="220" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="197" y="-3" type="curve" smooth="yes"/>
-      <point x="221" y="-3"/>
-      <point x="245" y="3"/>
-      <point x="268" y="12" type="curve"/>
-      <point x="263" y="26" type="line"/>
-      <point x="242" y="18"/>
-      <point x="221" y="14"/>
-      <point x="203" y="14" type="curve" smooth="yes"/>
-      <point x="149" y="14"/>
-      <point x="113" y="51"/>
-      <point x="113" y="108" type="curve" smooth="yes"/>
-      <point x="113" y="617" type="line"/>
-      <point x="92" y="617" type="line"/>
-      <point x="92" y="103" type="line" smooth="yes"/>
-      <point x="92" y="38"/>
-      <point x="134" y="-3"/>
+      <point x="198" y="-3" type="curve" smooth="yes"/>
+      <point x="222" y="-3"/>
+      <point x="246" y="3"/>
+      <point x="269" y="12" type="curve"/>
+      <point x="264" y="26" type="line"/>
+      <point x="243" y="18"/>
+      <point x="222" y="14"/>
+      <point x="204" y="14" type="curve" smooth="yes"/>
+      <point x="150" y="14"/>
+      <point x="114" y="51"/>
+      <point x="114" y="108" type="curve" smooth="yes"/>
+      <point x="114" y="617" type="line"/>
+      <point x="93" y="617" type="line"/>
+      <point x="93" y="103" type="line" smooth="yes"/>
+      <point x="93" y="38"/>
+      <point x="135" y="-3"/>
     </contour>
     <contour>
-      <point x="29" y="463" type="line"/>
-      <point x="256" y="463" type="line"/>
-      <point x="256" y="480" type="line"/>
-      <point x="29" y="480" type="line"/>
+      <point x="30" y="463" type="line"/>
+      <point x="257" y="463" type="line"/>
+      <point x="257" y="480" type="line"/>
+      <point x="30" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tbar.glif b/src/Cantarell-Light.ufo/glyphs/tbar.glif
index 0679092b..f7be8cfa 100644
--- a/src/Cantarell-Light.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tbar.glif
@@ -4,6 +4,6 @@
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-96" yOffset="-49"/>
+    <component base="strokeshortcomb" xOffset="-95" yOffset="-49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcaron.glif b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
index b72f08d6..b20e8945 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="107"/>
+    <component base="caroncomb.alt" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
index 26423367..8bdd4d9e 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
@@ -4,6 +4,6 @@
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="44"/>
+    <component base="cedillacomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
index 1e9dc655..18493e2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="40"/>
+    <component base="commaaccentcomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
index 873311cd..2b5d609d 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-116" yOffset="137"/>
+    <component base="dieresiscomb" xOffset="-115" yOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
index 1c797356..6f15ffe4 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="49"/>
+    <component base="dotbelowcomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
index 0f87da0f..331fec86 100644
--- a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-81"/>
+    <component base="macronbelowcomb" xOffset="-80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/v.glif b/src/Cantarell-Light.ufo/glyphs/v.glif
index 5da6bb52..51e7bb63 100644
--- a/src/Cantarell-Light.ufo/glyphs/v.glif
+++ b/src/Cantarell-Light.ufo/glyphs/v.glif
@@ -19,4 +19,10 @@ v
       <point x="27" y="480" 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 7751f861..5ea2eb42 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="750"/>
+  <advance width="749"/>
   <unicode hex="0077"/>
   <note>
 w
@@ -27,4 +27,10 @@ w
       <point x="28" y="480" 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/wacute.glif b/src/Cantarell-Light.ufo/glyphs/wacute.glif
index 0d2891c9..b605d2a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="750"/>
+  <advance width="749"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
index b772f451..697c945e 100644
--- a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="750"/>
+  <advance width="749"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
index bbcca8c6..b7439d7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="750"/>
+  <advance width="749"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/we-cy.glif b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
index 670001c8..9d8ca61d 100644
--- a/src/Cantarell-Light.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="750"/>
+  <advance width="749"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/wgrave.glif b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
index 50e32963..71f71e62 100644
--- a/src/Cantarell-Light.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="750"/>
+  <advance width="749"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
index 63847af2..eef80cdd 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="933"/>
+  <advance width="919"/>
   <unicode hex="00C6"/>
-  <anchor x="496" y="0" name="bottom"/>
-  <anchor x="496" y="694" name="top"/>
+  <anchor x="476" y="0" name="bottom"/>
+  <anchor x="476" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="-20" y="0" type="line"/>
+      <point x="72" y="0" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="403" y="694" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="200" y="202" type="line"/>
+      <point x="476" y="202" type="line"/>
+      <point x="476" y="282" type="line"/>
+      <point x="200" y="282" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="427" y="0" type="line"/>
+      <point x="510" y="0" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="467" y="0" type="line"/>
+      <point x="863" y="0" type="line"/>
+      <point x="863" y="72" type="line"/>
+      <point x="467" y="72" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="467" y="323" type="line"/>
+      <point x="836" y="323" type="line"/>
+      <point x="836" y="395" type="line"/>
+      <point x="467" y="395" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="467" y="622" type="line"/>
+      <point x="863" y="622" type="line"/>
+      <point x="863" y="694" type="line"/>
+      <point x="467" 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 50277fcf..943e4632 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="933"/>
+  <advance width="919"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="408"/>
+    <component base="acutecomb.case" xOffset="388"/>
   </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 fc67211f..d1554916 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="933"/>
+  <advance width="919"/>
   <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 a5fbf27c..b491317f 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="632"/>
+  <advance width="630"/>
   <unicode hex="0042"/>
   <note>
 B
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_.glif b/src/Cantarell-Regular.ufo/glyphs/C_.glif
index e768a8cc..61b93a30 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="639"/>
+  <advance width="645"/>
   <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 9d068220..0e650e23 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="639"/>
+  <advance width="645"/>
   <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 1970cbf3..b0641dc0 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="639"/>
+  <advance width="645"/>
   <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 5fa8fa86..33df3219 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="639"/>
+  <advance width="645"/>
   <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 52cc6fa1..72be0042 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="639"/>
+  <advance width="645"/>
   <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 624d01c5..0c1eaede 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="639"/>
+  <advance width="645"/>
   <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 7b43a146..a36ab22f 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="639"/>
+  <advance width="645"/>
   <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 f3af335b..a8a9085b 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="1329"/>
+  <advance width="1347"/>
   <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 0554b26b..7a157a8d 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="569"/>
+  <advance width="553"/>
   <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 71c1fcb6..9a31af34 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="578"/>
+  <advance width="584"/>
   <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 5cb4a985..d64a177b 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="578"/>
+  <advance width="584"/>
   <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 5553fc3f..be443b6b 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="578"/>
+  <advance width="584"/>
   <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 1ba45a9b..9bd22dbc 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="578"/>
+  <advance width="584"/>
   <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 dc942711..d96af962 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="578"/>
+  <advance width="584"/>
   <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 35150312..8815a726 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="578"/>
+  <advance width="584"/>
   <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 1bafd31f..6ec6496d 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="578"/>
+  <advance width="584"/>
   <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 0c7c4991..762e3ffd 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="578"/>
+  <advance width="584"/>
   <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 9ea67492..e326e5f0 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="578"/>
+  <advance width="584"/>
   <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 164cffc4..f91a04c7 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="578"/>
+  <advance width="584"/>
   <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 648d0f24..de97c9ff 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="578"/>
+  <advance width="584"/>
   <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 bf157ad2..c2437d2a 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="578"/>
+  <advance width="584"/>
   <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 3500a284..7d9e6df1 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="578"/>
+  <advance width="584"/>
   <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 758f8cee..6b2ae6bf 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="578"/>
+  <advance width="584"/>
   <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 a46ee61c..dbea133b 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="578"/>
+  <advance width="584"/>
   <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 1cdd6091..66b7fe84 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="578"/>
+  <advance width="584"/>
   <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 ad1a23f1..4b91a259 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="578"/>
+  <advance width="584"/>
   <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 a391f569..25f6f380 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="578"/>
+  <advance width="584"/>
   <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 5305f45a..451ba8de 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="578"/>
+  <advance width="584"/>
   <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 c31e46b3..d84143c1 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="578"/>
+  <advance width="584"/>
   <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 89493da1..65d82fde 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="578"/>
+  <advance width="584"/>
   <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 a051f947..4b665886 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="578"/>
+  <advance width="584"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
index 2f7927df..ce9e21b8 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="639"/>
+  <advance width="645"/>
   <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 235d7b0e..fd868e08 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="639"/>
+  <advance width="645"/>
   <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 9e79281b..a78c7c76 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="578"/>
+  <advance width="584"/>
   <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 568b59ab..b8ca156f 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="561"/>
+  <advance width="563"/>
   <unicode hex="0046"/>
   <note>
 F
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_.glif b/src/Cantarell-Regular.ufo/glyphs/G_.glif
index a442d165..280d6224 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="0047"/>
   <note>
 G
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
index 2e21ab2b..bf02f17e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
index 4a8deb22..da386c6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
index 137ae98b..00f0ff3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
index 846de5a4..0a6ca522 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
index 9e1e04b4..07628249 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
index 47036250..5a0d86ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="720"/>
+  <advance width="715"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
index 3b25fa75..682895a2 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="606"/>
+  <advance width="596"/>
   <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 a904bd73..0d803ed8 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="578"/>
+  <advance width="584"/>
   <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 cfd36a5c..6db7b418 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="578"/>
+  <advance width="584"/>
   <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 4168a392..1f296154 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="578"/>
+  <advance width="584"/>
   <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 58afc6a8..283e29d5 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="578"/>
+  <advance width="584"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_.glif b/src/Cantarell-Regular.ufo/glyphs/J_.glif
index fed3b503..0cbf4be0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="407"/>
+  <advance width="398"/>
   <unicode hex="004A"/>
   <note>
 J
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
index 27aa937e..97db3ff7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="407"/>
+  <advance width="398"/>
   <outline>
     <component base="J"/>
     <component base="acutecomb.case" xOffset="187"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
index dd88649a..0601a1a3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="407"/>
+  <advance width="398"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
index c2f6a246..1b397dca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="407"/>
+  <advance width="398"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_.glif b/src/Cantarell-Regular.ufo/glyphs/K_.glif
index 2bb6d24e..f2502fcc 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="603"/>
+  <advance width="608"/>
   <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 ad34e40c..81d8e261 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="603"/>
+  <advance width="608"/>
   <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 b5be243a..27b116f2 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="603"/>
+  <advance width="608"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index 3a32d3de..75607292 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="913"/>
+  <advance width="904"/>
   <unicode hex="01C7"/>
   <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 f33eeca0..10a68c88 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="1157"/>
+  <advance width="1148"/>
   <unicode hex="01CA"/>
   <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 fce1e29a..1fc2e4d3 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="991"/>
+  <advance width="997"/>
   <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/S_.glif b/src/Cantarell-Regular.ufo/glyphs/S_.glif
index 66e59329..f11acd9f 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="569"/>
+  <advance width="553"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="694" name="top"/>
+  <anchor x="273" y="0" name="bottom"/>
+  <anchor x="273" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="263" y="-10" type="curve" smooth="yes"/>
+      <point x="418" y="-10"/>
+      <point x="519" y="69"/>
+      <point x="519" y="191" type="curve" smooth="yes"/>
+      <point x="519" y="437"/>
+      <point x="130" y="339"/>
+      <point x="130" y="518" type="curve" smooth="yes"/>
+      <point x="130" y="591"/>
+      <point x="189" y="631"/>
+      <point x="295" y="631" type="curve" smooth="yes"/>
+      <point x="354" y="631"/>
+      <point x="418" y="619"/>
+      <point x="468" y="598" type="curve"/>
+      <point x="493" y="663" type="line"/>
+      <point x="434" y="689"/>
+      <point x="367" y="703"/>
+      <point x="301" y="703" type="curve" smooth="yes"/>
+      <point x="146" y="703"/>
+      <point x="45" y="626"/>
+      <point x="45" y="505" type="curve" smooth="yes"/>
+      <point x="45" y="267"/>
+      <point x="433" y="356"/>
+      <point x="433" y="179" type="curve" smooth="yes"/>
+      <point x="433" y="109"/>
+      <point x="373" y="64"/>
+      <point x="268" y="64" type="curve" smooth="yes"/>
+      <point x="205" y="64"/>
+      <point x="127" y="81"/>
+      <point x="59" y="109" type="curve"/>
+      <point x="34" y="44" type="line"/>
+      <point x="111" y="9"/>
+      <point x="189" 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 9c1dddf4..7cb67720 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="569"/>
+  <advance width="553"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="193"/>
+    <component base="acutecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
index 7b62b8b7..c8cc0830 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="569"/>
+  <advance width="553"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="193"/>
-    <component base="dotaccentcomb.case" xOffset="96" yOffset="107"/>
+    <component base="acutecomb.case" xOffset="185"/>
+    <component base="dotaccentcomb.case" xOffset="88" 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 eca23d5a..ce6df1d9 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="569"/>
+  <advance width="553"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="97"/>
+    <component base="caroncomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
index c6c1f0e6..e5ec03fa 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="569"/>
+  <advance width="553"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="97"/>
-    <component base="dotaccentcomb.case" xOffset="145" yOffset="142"/>
+    <component base="caroncomb.case" xOffset="89"/>
+    <component base="dotaccentcomb.case" xOffset="137" 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 e23d504d..53d5eb30 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="569"/>
+  <advance width="553"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="134"/>
+    <component base="cedillacomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
index 1d9d22aa..d7868865 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="569"/>
+  <advance width="553"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="93"/>
+    <component base="circumflexcomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
index 21ec8e5f..4f595c25 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="569"/>
+  <advance width="553"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="115"/>
+    <component base="commaaccentcomb" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
index f1c2bd14..062f0562 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="569"/>
+  <advance width="553"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="145"/>
+    <component base="dotaccentcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
index fcd7a4bf..81f29883 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="569"/>
+  <advance width="553"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="145"/>
+    <component base="dotbelowcomb" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
index f1c6cb41..4cc41c3d 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="569"/>
+  <advance width="553"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="145"/>
-    <component base="dotaccentcomb.case" xOffset="145"/>
+    <component base="dotbelowcomb" xOffset="137"/>
+    <component base="dotaccentcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_.glif b/src/Cantarell-Regular.ufo/glyphs/T_.glif
index 94f20724..029db1d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="556"/>
+  <advance width="566"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="347" name="center"/>
-  <anchor x="278" y="694" name="top"/>
+  <anchor x="283" y="0" name="bottom"/>
+  <anchor x="283" y="347" name="center"/>
+  <anchor x="283" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="241" y="0" type="line"/>
+      <point x="324" y="0" type="line"/>
+      <point x="324" y="660" type="line"/>
+      <point x="241" y="660" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="10" y="622" type="line"/>
+      <point x="556" y="622" type="line"/>
+      <point x="556" y="694" type="line"/>
+      <point x="10" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
index bfc6d019..92e8b551 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="556"/>
+  <advance width="566"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="50" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="55" 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 528962ea..a55759cb 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="556"/>
+  <advance width="566"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="94"/>
+    <component base="caroncomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
index 65b715f6..6509f2df 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="556"/>
+  <advance width="566"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="131"/>
+    <component base="cedillacomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
index ca187d47..13c43a07 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="556"/>
+  <advance width="566"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="112"/>
+    <component base="commaaccentcomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
index 0021ee2f..a316b14c 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="556"/>
+  <advance width="566"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="142"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </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 27c8f3b3..83c66459 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="556"/>
+  <advance width="566"/>
   <unicode hex="0422"/>
   <anchor x="614" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
index f61f0d27..8dc02082 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="556"/>
+  <advance width="566"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="33"/>
+    <component base="macronbelowcomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_.glif b/src/Cantarell-Regular.ufo/glyphs/U_.glif
index 0733fdee..d933ba90 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_.glif
@@ -1,34 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="667"/>
+  <advance width="671"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <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"/>
+  <anchor x="335" y="0" name="bottom"/>
+  <anchor x="429" y="10" name="ogonek"/>
+  <anchor x="335" y="694" name="top"/>
+  <anchor x="670" y="694" name="topright"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="330" y="-10" type="curve" smooth="yes"/>
+      <point x="491" y="-10"/>
+      <point x="599" y="92"/>
+      <point x="599" y="246" type="curve" smooth="yes"/>
+      <point x="599" y="694" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="518" y="236" type="line" smooth="yes"/>
+      <point x="518" y="127"/>
+      <point x="453" y="63"/>
+      <point x="341" y="63" type="curve" smooth="yes"/>
+      <point x="223" y="63"/>
+      <point x="155" y="133"/>
+      <point x="155" y="253" type="curve" smooth="yes"/>
+      <point x="155" y="694" type="line"/>
+      <point x="72" y="694" type="line"/>
+      <point x="72" y="243" type="line" smooth="yes"/>
+      <point x="72" y="90"/>
+      <point x="173" y="-10"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
index 977ebde0..d88af4d3 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="667"/>
+  <advance width="671"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
index 13df911c..6a6a85e2 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="667"/>
+  <advance width="671"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="brevecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
index dd7cc9da..7ee7d28a 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="667"/>
+  <advance width="671"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="149"/>
+    <component base="caroncomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
index a76df432..0d98eb05 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="667"/>
+  <advance width="671"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="145"/>
+    <component base="circumflexcomb.case" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
index 81d09cb0..26cc213c 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="667"/>
+  <advance width="671"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="112"/>
+    <component base="dblgravecomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
index c86350fa..943d7c18 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="667"/>
+  <advance width="671"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
index bb41a99c..03e40039 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="667"/>
+  <advance width="671"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
-    <component base="acutecomb.case" xOffset="245" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="acutecomb.case" xOffset="247" 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 40983b8a..27f97c6c 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="667"/>
+  <advance width="671"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
-    <component base="caroncomb.case" xOffset="149" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="caroncomb.case" xOffset="151" 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 90ae1458..10ee0381 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="667"/>
+  <advance width="671"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
-    <component base="gravecomb.case" xOffset="138" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="gravecomb.case" xOffset="140" 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 5ebc7d6b..d9827f17 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="667"/>
+  <advance width="671"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
-    <component base="macroncomb.case" xOffset="91" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="99"/>
+    <component base="macroncomb.case" xOffset="93" 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 19db7006..f82ea2a0 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="197"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
index 333b8962..bfd2f386 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="667"/>
+  <advance width="671"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
index 5ff95ba9..3a8fd153 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="189"/>
+    <component base="hookabovecomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
index 2afdc343..9c125ced 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="667"/>
+  <advance width="671"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="526" yOffset="212"/>
+    <component base="horncomb" xOffset="528" 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 fa9b6d6b..dd5bb246 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="247"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
index 8fcde282..288be41d 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="197"/>
+    <component base="dotbelowcomb" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
index 467ca286..80c5fcdc 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
index 3b18e155..6cf32d46 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="189"/>
+    <component base="hookabovecomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
index 241f61d5..a23a764f 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="667"/>
+  <advance width="671"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="93"/>
+    <component base="tildecomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
index 05d18a9a..4aeee7a0 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="667"/>
+  <advance width="671"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="123"/>
+    <component base="hungarumlautcomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
index e0cfd506..4405c46c 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="667"/>
+  <advance width="671"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="136"/>
+    <component base="breveinvertedcomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
index 8f6044c9..6d79ed08 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="667"/>
+  <advance width="671"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="91"/>
+    <component base="macroncomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
index d689c052..62f87005 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="667"/>
+  <advance width="671"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="91"/>
-    <component base="dieresiscomb.case" xOffset="97" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="93"/>
+    <component base="dieresiscomb.case" xOffset="99" 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 9d354e9b..51697727 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="667"/>
+  <advance width="671"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="-5"/>
+    <component base="ogonekcomb.tall.case" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
index 6c8a126e..f2739feb 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="667"/>
+  <advance width="671"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="160"/>
+    <component base="ringcomb.case" xOffset="162"/>
   </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 2fd05687..914c303a 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="578"/>
+  <advance width="580"/>
   <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 d5538bf6..812998f1 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="578"/>
+  <advance width="580"/>
   <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 b9a74fd1..37b7cb41 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="667"/>
+  <advance width="671"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="93"/>
+    <component base="tildecomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
index d94c91e3..ca661130 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="667"/>
+  <advance width="671"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="93"/>
-    <component base="acutecomb.case" xOffset="246" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="95"/>
+    <component base="acutecomb.case" xOffset="248" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_.glif b/src/Cantarell-Regular.ufo/glyphs/V_.glif
index 5aa4cae9..18f7e240 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="607"/>
+  <advance width="603"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="304" y="694" name="top"/>
+  <anchor x="302" y="0" name="bottom"/>
+  <anchor x="302" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="261" y="0" type="line"/>
+      <point x="342" y="0" type="line"/>
+      <point x="595" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
+      <point x="280" y="29" type="line"/>
+      <point x="330" y="29" type="line"/>
+      <point x="103" y="694" type="line"/>
+      <point x="8" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index f8956878..e81f402b 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="632"/>
+  <advance width="630"/>
   <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 9c7e42be..9e9a0818 100644
--- a/src/Cantarell-Regular.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/W_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="976"/>
+  <advance width="980"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="485" y="0" name="bottom"/>
-  <anchor x="485" y="694" name="top"/>
+  <anchor x="487" y="0" name="bottom"/>
+  <anchor x="487" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="231" y="0" type="line"/>
+      <point x="314" y="0" type="line"/>
+      <point x="506" y="653" type="line"/>
+      <point x="464" y="653" type="line"/>
+      <point x="672" y="0" type="line"/>
+      <point x="752" y="0" type="line"/>
+      <point x="968" y="694" type="line"/>
+      <point x="885" y="694" type="line"/>
+      <point x="693" y="39" type="line"/>
+      <point x="738" y="39" type="line"/>
+      <point x="537" y="689" type="line"/>
+      <point x="444" y="689" type="line"/>
+      <point x="255" y="39" type="line"/>
+      <point x="295" y="39" type="line"/>
+      <point x="108" y="694" type="line"/>
+      <point x="12" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_acute.glif b/src/Cantarell-Regular.ufo/glyphs/W_acute.glif
index ad942fc6..63e89322 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="976"/>
+  <advance width="980"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="397"/>
+    <component base="acutecomb.case" xOffset="399"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_circumflex.glif
index 20cbdf3d..9e508592 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="976"/>
+  <advance width="980"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="297"/>
+    <component base="circumflexcomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/W_dieresis.glif
index 069806c3..72a6f07e 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="976"/>
+  <advance width="980"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="249"/>
+    <component base="dieresiscomb.case" xOffset="251"/>
   </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 b52e93db..3db42018 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="976"/>
+  <advance width="980"/>
   <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 38e46658..67a5a257 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="976"/>
+  <advance width="980"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="290"/>
+    <component base="gravecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/X_.glif b/src/Cantarell-Regular.ufo/glyphs/X_.glif
index 23076282..82d69172 100644
--- a/src/Cantarell-Regular.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/X_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="606"/>
+  <advance width="596"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="303" y="0" name="bottom"/>
-  <anchor x="303" y="694" name="top"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="298" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="492" y="0" type="line"/>
+      <point x="591" y="0" type="line"/>
+      <point x="326" y="383" type="line"/>
+      <point x="124" y="694" type="line"/>
+      <point x="25" y="694" type="line"/>
+      <point x="270" y="331" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="5" y="0" type="line"/>
+      <point x="99" y="0" type="line"/>
+      <point x="302" y="309" type="line"/>
+      <point x="259" y="373" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="330" y="351" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="471" y="694" type="line"/>
+      <point x="287" y="415" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_.glif b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
index 4208cbbb..e238bdcb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="578"/>
+  <advance width="580"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="295" y="0" name="bottom"/>
-  <anchor x="295" y="694" name="top"/>
-  <anchor x="17" y="694" name="topleft"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="296" y="694" name="top"/>
+  <anchor x="18" y="694" name="topleft"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="251" y="0" type="line"/>
+      <point x="334" y="0" type="line"/>
+      <point x="334" y="299" type="line"/>
+      <point x="574" y="694" type="line"/>
+      <point x="483" y="694" type="line"/>
+      <point x="290" y="362" type="line"/>
+      <point x="301" y="362" type="line"/>
+      <point x="103" y="694" type="line"/>
+      <point x="6" y="694" type="line"/>
+      <point x="251" y="299" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
index 996a702d..0858bdc0 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="578"/>
+  <advance width="580"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="207"/>
+    <component base="acutecomb.case" xOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
index 661885ad..adc5b224 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="578"/>
+  <advance width="580"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="107"/>
+    <component base="circumflexcomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
index 41e05d43..ec9bd8ac 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="578"/>
+  <advance width="580"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="59"/>
+    <component base="dieresiscomb.case" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
index 315f246f..fb347d06 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="578"/>
+  <advance width="580"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="159"/>
+    <component base="dotaccentcomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
index afc37ad3..3239aca3 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="578"/>
+  <advance width="580"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="159"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
index 0c9877fa..212ab17f 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="578"/>
+  <advance width="580"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="100"/>
+    <component base="gravecomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
index 12d5c59b..1baf257f 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="578"/>
+  <advance width="580"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="151"/>
+    <component base="hookabovecomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
index d9b9c583..e6d8be59 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="578"/>
+  <advance width="580"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="53"/>
+    <component base="macroncomb.case" xOffset="54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
index 81b00348..4384661d 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="578"/>
+  <advance width="580"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="55"/>
+    <component base="tildecomb.case" xOffset="56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_.glif b/src/Cantarell-Regular.ufo/glyphs/Z_.glif
index f23fe194..4c4d2136 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="618"/>
+  <advance width="636"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="309" y="0" name="bottom"/>
-  <anchor x="309" y="694" name="top"/>
+  <anchor x="319" y="0" name="bottom"/>
+  <anchor x="319" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <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"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
index de766a3d..6ac2b069 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="618"/>
+  <advance width="636"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="221"/>
+    <component base="acutecomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
index 553bd322..76267af3 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="618"/>
+  <advance width="636"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="125"/>
+    <component base="caroncomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
index ff7d12b2..adf1bfdb 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="618"/>
+  <advance width="636"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="173"/>
+    <component base="dotaccentcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
index 573fb05b..8d79b6f5 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="618"/>
+  <advance width="636"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="173"/>
+    <component base="dotbelowcomb" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/f_f_l.glif b/src/Cantarell-Regular.ufo/glyphs/f_f_l.glif
index e56bb3e1..c5311d70 100644
--- a/src/Cantarell-Regular.ufo/glyphs/f_f_l.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/f_f_l.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f_f_l" format="2">
-  <advance width="951"/>
+  <advance width="958"/>
   <outline>
     <component base="f_f"/>
     <component base="l" xOffset="680"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fl.glif b/src/Cantarell-Regular.ufo/glyphs/fl.glif
index ca46ce81..b9c9d786 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fl.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="611"/>
+  <advance width="618"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/l.glif b/src/Cantarell-Regular.ufo/glyphs/l.glif
index 4c0dd94a..88f4b32f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/l.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/l.glif
@@ -1,33 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="006C"/>
   <note>
 l
 </note>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="139" y="386" name="center"/>
-  <anchor x="272" y="353" name="periodcentered"/>
-  <anchor x="121" y="739" name="top"/>
-  <anchor x="268" y="482" name="topright"/>
+  <anchor x="163" y="0" name="bottom"/>
+  <anchor x="142" y="386" name="center"/>
+  <anchor x="276" y="353" name="periodcentered"/>
+  <anchor x="124" y="739" name="top"/>
+  <anchor x="271" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="189" y="-6" type="curve" smooth="yes"/>
-      <point x="215" y="-6"/>
-      <point x="246" y="0"/>
-      <point x="265" y="10" type="curve"/>
-      <point x="247" y="66" type="line"/>
-      <point x="235" y="61"/>
-      <point x="224" y="58"/>
-      <point x="212" y="58" type="curve" smooth="yes"/>
-      <point x="178" y="58"/>
-      <point x="160" y="81"/>
-      <point x="160" y="118" type="curve" smooth="yes"/>
-      <point x="160" y="739" type="line"/>
-      <point x="80" y="739" type="line"/>
-      <point x="80" y="108" type="line" smooth="yes"/>
-      <point x="80" y="39"/>
-      <point x="123" y="-6"/>
+      <point x="192" y="-6" type="curve" smooth="yes"/>
+      <point x="218" y="-6"/>
+      <point x="249" y="0"/>
+      <point x="268" y="10" type="curve"/>
+      <point x="250" y="66" type="line"/>
+      <point x="238" y="61"/>
+      <point x="227" y="58"/>
+      <point x="215" y="58" type="curve" smooth="yes"/>
+      <point x="181" y="58"/>
+      <point x="163" y="81"/>
+      <point x="163" y="118" type="curve" smooth="yes"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+      <point x="83" y="108" type="line" smooth="yes"/>
+      <point x="83" y="39"/>
+      <point x="126" y="-6"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>n</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lacute.glif b/src/Cantarell-Regular.ufo/glyphs/lacute.glif
index 6581141a..6e0fcefd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="33" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="36" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist 
b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
index 757724d1..ff940a37 100644
--- a/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Regular.ufo/glyphs/layerinfo.plist
@@ -1621,7 +1621,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.one.osf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tf</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.one.tosf</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oneeighth</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lcaron.glif b/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
index 2de0a24e..d6ce68a0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="142"/>
+    <component base="caroncomb.alt" xOffset="145"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
index c47e8250..d9996b8d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="-6"/>
+    <component base="commaaccentcomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ldot.glif b/src/Cantarell-Regular.ufo/glyphs/ldot.glif
index 3b54bdf7..9c0a184d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="272"/>
+    <component base="periodcentered.loclCAT" xOffset="276"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
index 7f1070e3..fc21a1bd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="24"/>
+    <component base="dotbelowcomb" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lj.glif b/src/Cantarell-Regular.ufo/glyphs/lj.glif
index c494f14a..6759e8cb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="517"/>
+  <advance width="524"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="271"/>
+    <component base="j" xOffset="278"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
index e607e009..b6cf607e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-54"/>
+    <component base="macronbelowcomb.narrow" xOffset="-51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lslash.glif b/src/Cantarell-Regular.ufo/glyphs/lslash.glif
index ec4a6b6e..0682d208 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lslash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="271"/>
+  <advance width="278"/>
   <unicode hex="0142"/>
   <outline>
     <component base="l"/>
-    <component base="slashshortcomb" xOffset="-40" yOffset="100"/>
+    <component base="slashshortcomb" xOffset="-37" yOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/one.glif b/src/Cantarell-Regular.ufo/glyphs/one.glif
index 2719efc1..e26ba3c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/one.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/one.glif
@@ -8,10 +8,10 @@
       <point x="299" y="-5" type="line"/>
       <point x="299" y="694" type="line"/>
       <point x="253" y="694" type="line"/>
-      <point x="25" y="526" type="line"/>
-      <point x="66" y="470" type="line"/>
-      <point x="254" y="609" type="line"/>
-      <point x="222" y="632" type="line"/>
+      <point x="28" y="550" type="line"/>
+      <point x="61" y="493" type="line"/>
+      <point x="254" y="611" type="line"/>
+      <point x="222" y="637" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/t.glif b/src/Cantarell-Regular.ufo/glyphs/t.glif
index e1abf22b..d230787d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/t.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/t.glif
@@ -5,34 +5,34 @@
   <note>
 t
 </note>
-  <anchor x="207" y="5" name="bottom"/>
-  <anchor x="171" y="246" name="center"/>
-  <anchor x="135" y="623" name="top"/>
-  <anchor x="292" y="482" name="topright"/>
+  <anchor x="211" y="5" name="bottom"/>
+  <anchor x="175" y="246" name="center"/>
+  <anchor x="139" y="623" name="top"/>
+  <anchor x="296" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="244" y="-5" type="curve" smooth="yes"/>
-      <point x="277" y="-5"/>
-      <point x="310" y="3"/>
-      <point x="333" y="13" type="curve"/>
-      <point x="315" y="71" type="line"/>
-      <point x="300" y="64"/>
-      <point x="278" y="60"/>
-      <point x="261" y="60" type="curve" smooth="yes"/>
-      <point x="211" y="60"/>
-      <point x="178" y="92"/>
-      <point x="178" y="140" type="curve" smooth="yes"/>
-      <point x="178" y="623" type="line"/>
-      <point x="98" y="623" type="line"/>
-      <point x="98" y="129" type="line" smooth="yes"/>
-      <point x="98" y="49"/>
-      <point x="156" y="-5"/>
+      <point x="248" y="-5" type="curve" smooth="yes"/>
+      <point x="281" y="-5"/>
+      <point x="314" y="3"/>
+      <point x="337" y="13" type="curve"/>
+      <point x="319" y="71" type="line"/>
+      <point x="304" y="64"/>
+      <point x="282" y="60"/>
+      <point x="265" y="60" type="curve" smooth="yes"/>
+      <point x="215" y="60"/>
+      <point x="182" y="92"/>
+      <point x="182" y="140" type="curve" smooth="yes"/>
+      <point x="182" y="623" type="line"/>
+      <point x="102" y="623" type="line"/>
+      <point x="102" y="129" type="line" smooth="yes"/>
+      <point x="102" y="49"/>
+      <point x="160" y="-5"/>
     </contour>
     <contour>
-      <point x="33" y="415" type="line"/>
-      <point x="310" y="415" type="line"/>
-      <point x="310" y="482" type="line"/>
-      <point x="33" y="482" type="line"/>
+      <point x="37" y="415" type="line"/>
+      <point x="314" y="415" type="line"/>
+      <point x="314" y="482" type="line"/>
+      <point x="37" y="482" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tbar.glif b/src/Cantarell-Regular.ufo/glyphs/tbar.glif
index b74bc4b0..5c030a0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tbar.glif
@@ -4,6 +4,6 @@
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-57" yOffset="-52"/>
+    <component base="strokeshortcomb" xOffset="-53" yOffset="-52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcaron.glif b/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
index d45dc8b3..c3b04ebe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcaron.glif
@@ -4,6 +4,6 @@
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="166"/>
+    <component base="caroncomb.alt" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif b/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
index d63311fb..8d6f6dc3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcedilla.glif
@@ -4,6 +4,6 @@
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="60" yOffset="5"/>
+    <component base="cedillacomb" xOffset="64" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
index 97569d7f..90a39508 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tcommaaccent.glif
@@ -4,6 +4,6 @@
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="41" yOffset="5"/>
+    <component base="commaaccentcomb" xOffset="45" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif b/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
index c5ebda74..15b84613 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tdieresis.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-98" yOffset="141"/>
+    <component base="dieresiscomb" xOffset="-94" yOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
index 19880ce5..1311d300 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tdotbelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="71" yOffset="5"/>
+    <component base="dotbelowcomb" xOffset="75" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
index 32ad8a8e..7e870c6d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tlinebelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-38" yOffset="5"/>
+    <component base="macronbelowcomb" xOffset="-34" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/v.glif b/src/Cantarell-Regular.ufo/glyphs/v.glif
index 3ade6926..2014d442 100644
--- a/src/Cantarell-Regular.ufo/glyphs/v.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/v.glif
@@ -19,4 +19,10 @@ v
       <point x="12" y="482" 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.glif b/src/Cantarell-Regular.ufo/glyphs/w.glif
index a6f837a8..0a2dd613 100644
--- a/src/Cantarell-Regular.ufo/glyphs/w.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/w.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="w" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="0077"/>
   <note>
 w
@@ -27,4 +27,10 @@ w
       <point x="14" y="482" 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/wacute.glif b/src/Cantarell-Regular.ufo/glyphs/wacute.glif
index 8ffab1a4..b250c1b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
index 66d7f3de..2321aa06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wcircumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif b/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
index 2e2725d5..317d4e33 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wdieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/we-cy.glif b/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
index d151685c..2ba581da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/wgrave.glif b/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
index ed415999..097790e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/wgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="787"/>
+  <advance width="786"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>


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