[cantarell-fonts/respacing] More respacing (primarily thin) plus remove unnecessary anchors from some Cyrillics



commit 1e89dad212b98997617a63fe66768ac31505b0ec
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Nov 10 00:21:07 2019 +0000

    More respacing (primarily thin) plus remove unnecessary anchors from some Cyrillics

 src/Cantarell-Bold.ufo/features.fea                |  73 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/A_.glif              |   6 +
 src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif          |  54 ++++----
 src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif          |   1 -
 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/O_-cy.glif           |   1 -
 src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif          |   1 -
 src/Cantarell-Bold.ufo/glyphs/a-cy.glif            |   1 -
 src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/acute.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif   |   4 +-
 src/Cantarell-Bold.ufo/glyphs/breve.glif           |  10 +-
 .../glyphs/breveinvertedcomb.case.glif             |   2 +-
 src/Cantarell-Bold.ufo/glyphs/caron.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/cedilla.glif         |  10 +-
 src/Cantarell-Bold.ufo/glyphs/circumflex.glif      |  10 +-
 src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dieresis.glif        |  10 +-
 src/Cantarell-Bold.ufo/glyphs/dotaccent.glif       |  10 +-
 src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/estimated.glif       |  62 ++++-----
 .../glyphs/firsttonechinese.glif                   |   4 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/grave.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif    |  10 +-
 src/Cantarell-Bold.ufo/glyphs/ie-cy.glif           |   1 -
 src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/io-cy.glif           |   2 +-
 src/Cantarell-Bold.ufo/glyphs/macron.glif          |  10 +-
 src/Cantarell-Bold.ufo/glyphs/o-cy.glif            |   1 -
 src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif    |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ogonek.glif          |  10 +-
 src/Cantarell-Bold.ufo/glyphs/plusminus.glif       |  16 +--
 src/Cantarell-Bold.ufo/glyphs/primemod.glif        |   4 +-
 src/Cantarell-Bold.ufo/glyphs/registered.glif      |   4 +-
 src/Cantarell-Bold.ufo/glyphs/ring.glif            |  10 +-
 src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif    |  12 +-
 src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif   |  30 ++---
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Bold.ufo/glyphs/te-cy.glif           |   1 -
 src/Cantarell-Bold.ufo/glyphs/tilde.glif           |  10 +-
 src/Cantarell-Bold.ufo/glyphs/u-cy.glif            |   1 -
 src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif    |   2 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   2 +-
 src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif      |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif       |   2 +-
 src/Cantarell-Bold.ufo/glyphs/ve-cy.glif           |  32 ++---
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif |   4 +-
 src/Cantarell-Light.ufo/features.fea               |  73 ++++++-----
 src/Cantarell-Light.ufo/glyphs/A_-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/A_.glif             |  36 +++---
 src/Cantarell-Light.ufo/glyphs/A_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_breveacute.glif   |   6 +-
 .../glyphs/A_brevedotbelow.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif   |   6 +-
 .../glyphs/A_brevehookabove.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/A_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_circumflex.glif   |   4 +-
 .../glyphs/A_circumflexacute.glif                  |   6 +-
 .../glyphs/A_circumflexdotbelow.glif               |   6 +-
 .../glyphs/A_circumflexgrave.glif                  |   6 +-
 .../glyphs/A_circumflexhookabove.glif              |   6 +-
 .../glyphs/A_circumflextilde.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_hookabove.glif    |   4 +-
 .../glyphs/A_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ring.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_ringacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/A_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/B_.glif             |  74 +++++------
 src/Cantarell-Light.ufo/glyphs/B_e-cy.glif         |  46 +++----
 src/Cantarell-Light.ufo/glyphs/C_he-cy.glif        |   2 +-
 .../glyphs/C_hedescender-cy.glif                   |   2 +-
 .../glyphs/C_hedieresis-cy.glif                    |   2 +-
 .../glyphs/C_hekhakassian-cy.glif                  |   2 +-
 .../glyphs/C_heverticalstroke-cy.glif              |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_.glif             |  44 +++----
 src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_croat.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_e-cy.glif         |  46 +++----
 src/Cantarell-Light.ufo/glyphs/D_je-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_zcaron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif       |  26 ++--
 src/Cantarell-Light.ufo/glyphs/E_.glif             |  34 ++---
 src/Cantarell-Light.ufo/glyphs/E_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_circumflex.glif   |   4 +-
 .../glyphs/E_circumflexacute.glif                  |   6 +-
 .../glyphs/E_circumflexdotbelow.glif               |   6 +-
 .../glyphs/E_circumflexgrave.glif                  |   6 +-
 .../glyphs/E_circumflexhookabove.glif              |   6 +-
 .../glyphs/E_circumflextilde.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dieresis.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_hookabove.glif    |   4 +-
 .../glyphs/E_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_l-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_m-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_macronacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/E_n-cy.glif         |   2 +-
 .../glyphs/E_ndescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_ng.glif           |  46 +++----
 src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif      |  30 ++---
 src/Cantarell-Light.ufo/glyphs/E_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_r-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/E_th.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/E_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/F_.glif             |  26 ++--
 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_e-cy.glif         |  18 +--
 .../glyphs/G_edescender-cy.glif                    |   4 +-
 .../glyphs/G_hemiddlehook-cy.glif                  |  54 ++++----
 src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif  |  22 ++--
 src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif  |  18 +--
 src/Cantarell-Light.ufo/glyphs/G_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_macron.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/H_.glif             |  34 ++---
 src/Cantarell-Light.ufo/glyphs/H_a-cy.glif         |   2 +-
 .../glyphs/H_adescender-cy.glif                    |   2 +-
 src/Cantarell-Light.ufo/glyphs/H_bar.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_.glif             |  18 +--
 src/Cantarell-Light.ufo/glyphs/I_a-cy.glif         |  52 ++++----
 src/Cantarell-Light.ufo/glyphs/I_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis.glif     |   4 +-
 .../glyphs/I_dieresisacute.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_e-cy.glif         |   3 +-
 src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_i-cy.glif         |  30 ++---
 src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif    |   4 +-
 .../glyphs/I_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_o-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/I_u-cy.glif         |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/J_.glif             |   2 +-
 src/Cantarell-Light.ufo/glyphs/J_acute.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/J_circumflex.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/J_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/K_.glif             |  28 ++---
 src/Cantarell-Light.ufo/glyphs/K_a-cy.glif         |  36 +++---
 src/Cantarell-Light.ufo/glyphs/K_acute.glif        |   4 +-
 .../glyphs/K_adescender-cy.glif                    |   4 +-
 .../glyphs/K_averticalstroke-cy.glif               |  40 +++---
 src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/K_je-cy.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_.glif             |  24 ++--
 src/Cantarell-Light.ufo/glyphs/L_J_.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dot.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_j.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/L_slash.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/M_.glif             |  38 +++---
 src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_.glif             |  28 ++---
 src/Cantarell-Light.ufo/glyphs/N_J_.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_j.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_je-cy.glif        |  62 ++++-----
 src/Cantarell-Light.ufo/glyphs/N_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/N_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_-cy.glif          |   1 -
 src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/O_hm.glif           |  66 +++++-----
 src/Cantarell-Light.ufo/glyphs/P_.glif             |  46 +++----
 src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/P_e-cy.glif         |  20 +--
 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             |  54 ++++----
 src/Cantarell-Light.ufo/glyphs/R_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif     |   4 +-
 .../glyphs/R_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/R_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_.glif             |  70 +++++------
 src/Cantarell-Light.ufo/glyphs/S_acute.glif        |   4 +-
 .../glyphs/S_acutedotaccent.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/S_altillo.glif      |   4 +-
 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/S_ha-cy.glif        |  28 ++---
 src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif       |  42 +++----
 src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif   |  42 +++----
 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         |   3 +-
 src/Cantarell-Light.ufo/glyphs/T_horn.glif         |  46 +++----
 src/Cantarell-Light.ufo/glyphs/T_linebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/T_se-cy.glif        |  26 ++--
 src/Cantarell-Light.ufo/glyphs/T_she-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/U_-cy.glif          |  24 ++--
 src/Cantarell-Light.ufo/glyphs/U_.glif             |  46 +++----
 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-cy.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 +-
 .../glyphs/U_hungarumlaut-cy.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif |   4 +-
 .../glyphs/U_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron-cy.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_short-cy.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_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/W_.glif             |  38 +++---
 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_at-cy.glif        |  50 ++++----
 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_eru-cy.glif       |  52 ++++----
 .../glyphs/Y_erudieresis-cy.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_i-cy.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/Y_usbig-cy.glif     |  60 ++++-----
 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/Z_e-cy.glif         |  90 ++++++-------
 .../glyphs/Z_edescender-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/a-cy.glif           |   1 -
 src/Cantarell-Light.ufo/glyphs/abreve-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/acute.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/ampersand.glif      |  78 ++++++------
 src/Cantarell-Light.ufo/glyphs/apostrophemod.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/at.glif             | 140 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/bar.glif            |  10 +-
 src/Cantarell-Light.ufo/glyphs/blank.glif          |  18 +--
 src/Cantarell-Light.ufo/glyphs/breve.glif          |  10 +-
 .../glyphs/brevecomb-cy.case.glif                  |   2 +-
 src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif |   2 +-
 .../glyphs/breveinvertedcomb.case.glif             |   2 +-
 src/Cantarell-Light.ufo/glyphs/brokenbar.glif      |  18 +--
 src/Cantarell-Light.ufo/glyphs/caron.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/cedilla.glif        |  10 +-
 src/Cantarell-Light.ufo/glyphs/circumflex.glif     |  10 +-
 src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/copyright.glif      | 102 +++++++--------
 src/Cantarell-Light.ufo/glyphs/dagger.glif         |  30 ++---
 src/Cantarell-Light.ufo/glyphs/daggerdbl.glif      |  54 ++++----
 src/Cantarell-Light.ufo/glyphs/dieresis.glif       |  10 +-
 src/Cantarell-Light.ufo/glyphs/dotaccent.glif      |  10 +-
 src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/downA_rrow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/eight.glif          |  90 ++++++-------
 src/Cantarell-Light.ufo/glyphs/eight.osf.glif      |  90 ++++++-------
 src/Cantarell-Light.ufo/glyphs/emptyset.glif       |  58 ++++-----
 src/Cantarell-Light.ufo/glyphs/estimated.glif      |  62 ++++-----
 .../glyphs/firsttonechinese.glif                   |   4 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/grave.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif   |  10 +-
 src/Cantarell-Light.ufo/glyphs/ie-cy.glif          |   1 -
 src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/increment.glif      |  20 +--
 src/Cantarell-Light.ufo/glyphs/integral.glif       |  66 +++++-----
 src/Cantarell-Light.ufo/glyphs/io-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/literS_ign.glif     |  70 +++++------
 src/Cantarell-Light.ufo/glyphs/lozenge.glif        |  22 ++--
 src/Cantarell-Light.ufo/glyphs/macron.glif         |  10 +-
 src/Cantarell-Light.ufo/glyphs/minute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/numero.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/o-cy.glif           |   1 -
 src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/ogonek.glif         |  10 +-
 src/Cantarell-Light.ufo/glyphs/palochka-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/paragraph.glif      |  30 ++---
 src/Cantarell-Light.ufo/glyphs/partialdiff.glif    |  78 ++++++------
 src/Cantarell-Light.ufo/glyphs/percent.glif        | 106 ++++++++--------
 .../glyphs/periodcentered.loclC_A_T_.case.glif     |   2 +-
 .../glyphs/periodcentered.loclC_A_T_.glif          |  24 ++--
 src/Cantarell-Light.ufo/glyphs/perthousand.glif    | 106 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/primemod.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/product.glif        |  18 +--
 src/Cantarell-Light.ufo/glyphs/radical.glif        |  20 +--
 src/Cantarell-Light.ufo/glyphs/registered.glif     | 102 +++++++--------
 src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif    |  22 ++--
 src/Cantarell-Light.ufo/glyphs/ring.glif           |  10 +-
 src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif   |  12 +-
 src/Cantarell-Light.ufo/glyphs/ringhalfright.glif  |  30 ++---
 src/Cantarell-Light.ufo/glyphs/second.glif         |   6 +-
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Light.ufo/glyphs/section.glif        | 106 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/summation.glif      |  26 ++--
 src/Cantarell-Light.ufo/glyphs/te-cy.glif          |   1 -
 src/Cantarell-Light.ufo/glyphs/three.glif          |  86 ++++++-------
 src/Cantarell-Light.ufo/glyphs/three.osf.glif      |  82 ++++++------
 src/Cantarell-Light.ufo/glyphs/tilde.glif          |  10 +-
 src/Cantarell-Light.ufo/glyphs/trademark.glif      |  50 ++++----
 src/Cantarell-Light.ufo/glyphs/u-cy.glif           |   1 -
 src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif   |   2 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/umacron-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/upA_rrow.glif       |  22 ++--
 src/Cantarell-Light.ufo/glyphs/ushort-cy.glif      |   2 +-
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 .../glyphs/verticallinemod.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.glif           |  44 +++----
 src/Cantarell-Light.ufo/glyphs/zero.osf.glif       |  52 ++++----
 src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/zero.zero.glif      |   2 +-
 src/Cantarell-Regular.ufo/features.fea             |  73 ++++++-----
 src/Cantarell-Regular.ufo/glyphs/A_-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_.glif           |   8 +-
 src/Cantarell-Regular.ufo/glyphs/A_acute.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif |   2 +-
 .../glyphs/A_brevedotbelow.glif                    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif |   2 +-
 .../glyphs/A_brevehookabove.glif                   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_caron.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif |   2 +-
 .../glyphs/A_circumflexacute.glif                  |   2 +-
 .../glyphs/A_circumflexdotbelow.glif               |   2 +-
 .../glyphs/A_circumflexgrave.glif                  |   2 +-
 .../glyphs/A_circumflexhookabove.glif              |   2 +-
 .../glyphs/A_circumflextilde.glif                  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif   |   2 +-
 .../glyphs/A_dieresis-cy.glif                      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_grave.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif  |   2 +-
 .../glyphs/A_invertedbreve.glif                    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_macron.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_ring.glif       |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/A_tilde.glif      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif       |  54 ++++----
 src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif       |   1 -
 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/O_-cy.glif        |   1 -
 .../glyphs/O_dieresis-cy.glif                      |   2 +-
 src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif       |   1 -
 src/Cantarell-Regular.ufo/glyphs/a-cy.glif         |   1 -
 src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/acute.glif        |  10 +-
 src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif |   2 +-
 .../glyphs/apostrophemod.glif                      |   4 +-
 src/Cantarell-Regular.ufo/glyphs/breve.glif        |  10 +-
 .../glyphs/brevecomb-cy.case.glif                  |   2 +-
 src/Cantarell-Regular.ufo/glyphs/caron.glif        |  10 +-
 src/Cantarell-Regular.ufo/glyphs/cedilla.glif      |  10 +-
 src/Cantarell-Regular.ufo/glyphs/circumflex.glif   |  10 +-
 .../glyphs/commaturnedmod.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/dieresis.glif     |  10 +-
 src/Cantarell-Regular.ufo/glyphs/dotaccent.glif    |  10 +-
 .../glyphs/doubleprimemod.glif                     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/estimated.glif    |  62 ++++-----
 .../glyphs/firsttonechinese.glif                   |   4 +-
 .../glyphs/fourthtonechinese.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/grave.glif        |  10 +-
 src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif |  10 +-
 src/Cantarell-Regular.ufo/glyphs/ie-cy.glif        |   1 -
 src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/io-cy.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/macron.glif       |  10 +-
 src/Cantarell-Regular.ufo/glyphs/o-cy.glif         |   1 -
 src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ogonek.glif       |  10 +-
 .../glyphs/periodcentered.loclC_A_T_.case.glif     |   2 +-
 src/Cantarell-Regular.ufo/glyphs/primemod.glif     |   4 +-
 src/Cantarell-Regular.ufo/glyphs/ring.glif         |  10 +-
 src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif |  12 +-
 .../glyphs/ringhalfright.glif                      |  30 ++---
 .../glyphs/secondtonechinese.glif                  |   4 +-
 src/Cantarell-Regular.ufo/glyphs/te-cy.glif        |   1 -
 src/Cantarell-Regular.ufo/glyphs/tilde.glif        |  10 +-
 src/Cantarell-Regular.ufo/glyphs/u-cy.glif         |   1 -
 src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif |   2 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif   |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif    |   2 +-
 src/Cantarell-Regular.ufo/glyphs/ve-cy.glif        |  32 ++---
 .../glyphs/verticallinelowmod.glif                 |   4 +-
 .../glyphs/verticallinemod.glif                    |   4 +-
 490 files changed, 3154 insertions(+), 2881 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/features.fea b/src/Cantarell-Bold.ufo/features.fea
index 90a096d1..6cc69ea6 100644
--- a/src/Cantarell-Bold.ufo/features.fea
+++ b/src/Cantarell-Bold.ufo/features.fea
@@ -4,17 +4,17 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
@@ -76,35 +76,39 @@ lookup ccmp_Other_3 {
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -296,6 +300,7 @@ sub descender-cy by descender-cy.case;
 
 feature liga {
 # automatic
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -303,9 +308,9 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero by zero.zero;
 
 } zero;
 
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_.glif b/src/Cantarell-Bold.ufo/glyphs/A_.glif
index 072729ce..7e05f767 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_.glif
@@ -26,4 +26,10 @@ A
       <point x="221" y="299" type="line"/>
     </contour>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
index 1eca8740..29f4737b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="668"/>
+  <advance width="661"/>
   <unicode hex="042F"/>
-  <anchor x="333" y="694" name="top"/>
+  <anchor x="326" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="424" y="0" type="line"/>
-      <point x="597" y="0" type="line"/>
-      <point x="597" y="694" type="line"/>
-      <point x="320" y="694" type="line" smooth="yes"/>
-      <point x="154" y="694"/>
-      <point x="42" y="593"/>
-      <point x="42" y="443" type="curve" smooth="yes"/>
-      <point x="42" y="307"/>
-      <point x="133" y="231"/>
-      <point x="296" y="231" type="curve" smooth="yes"/>
-      <point x="476" y="231" type="line"/>
-      <point x="476" y="368" type="line"/>
-      <point x="320" y="368" type="line" smooth="yes"/>
-      <point x="263" y="368"/>
-      <point x="222" y="408"/>
-      <point x="222" y="466" type="curve" smooth="yes"/>
-      <point x="222" y="514"/>
-      <point x="251" y="543"/>
-      <point x="296" y="543" type="curve" smooth="yes"/>
-      <point x="424" y="543" type="line"/>
+      <point x="417" y="0" type="line"/>
+      <point x="590" y="0" type="line"/>
+      <point x="590" y="694" type="line"/>
+      <point x="313" y="694" type="line" smooth="yes"/>
+      <point x="147" y="694"/>
+      <point x="35" y="593"/>
+      <point x="35" y="443" type="curve" smooth="yes"/>
+      <point x="35" y="307"/>
+      <point x="126" y="231"/>
+      <point x="289" y="231" type="curve" smooth="yes"/>
+      <point x="469" y="231" type="line"/>
+      <point x="469" y="368" type="line"/>
+      <point x="313" y="368" type="line" smooth="yes"/>
+      <point x="256" y="368"/>
+      <point x="215" y="408"/>
+      <point x="215" y="466" type="curve" smooth="yes"/>
+      <point x="215" y="514"/>
+      <point x="244" y="543"/>
+      <point x="289" y="543" type="curve" smooth="yes"/>
+      <point x="417" y="543" type="line"/>
     </contour>
     <contour>
-      <point x="14" y="0" type="line"/>
-      <point x="222" y="0" type="line"/>
-      <point x="396" y="277" type="line"/>
-      <point x="213" y="277" type="line"/>
+      <point x="7" y="0" type="line"/>
+      <point x="215" y="0" type="line"/>
+      <point x="389" y="277" type="line"/>
+      <point x="206" y="277" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>I</string>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
index 0eb91bc2..c69045a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="Ie-cy" format="2">
   <advance width="619"/>
   <unicode hex="0415"/>
-  <anchor x="305" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
index c661889f..f0e7ff23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="72"/>
+    <component base="brevecomb-cy.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
index 2fe9d5f3..d1e4618e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="76"/>
+    <component base="gravecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
index dedb7d85..0f263109 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="30"/>
+    <component base="dieresiscomb.case" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
index 5355b5b9..032301f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="O-cy" format="2">
   <advance width="782"/>
   <unicode hex="041E"/>
-  <anchor x="380" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
index 093eae0c..25db07b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
+    <component base="dieresiscomb.case" xOffset="116"/>
   </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 62ce0f7a..50dbb6b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="Te-cy" format="2">
   <advance width="614"/>
   <unicode hex="0422"/>
-  <anchor x="600" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
index 0187b20a..ea6974d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/a-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="a-cy" format="2">
   <advance width="550"/>
   <unicode hex="0430"/>
-  <anchor x="264" y="490" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
index 1e2b6497..352d5c8f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/abreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="31"/>
+    <component base="brevecomb-cy" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acute.glif b/src/Cantarell-Bold.ufo/glyphs/acute.glif
index f14acfa4..00be7acf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="287"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-4"/>
+    <component base="acutecomb" xOffset="109"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
index 31d2c690..1a8ca4ec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/adieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="-5"/>
+    <component base="dieresiscomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
index 3580da7e..4dd045d2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="288"/>
+  <advance width="234"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright" xOffset="-15"/>
+    <component base="quoteright" xOffset="-29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/breve.glif b/src/Cantarell-Bold.ufo/glyphs/breve.glif
index 9a3be707..b837232f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="460"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-25"/>
+    <component base="brevecomb" xOffset="36"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
index 4bb4e9d1..237b66f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/breveinvertedcomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="231" y="694" name="_top"/>
   <anchor x="231" y="932" name="top"/>
   <outline>
-    <component base="breveinvertedcomb" yOffset="170"/>
+    <component base="breveinvertedcomb" yOffset="200"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/caron.glif b/src/Cantarell-Bold.ufo/glyphs/caron.glif
index 6009c1ab..2c067c9c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="413"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="-3"/>
+    <component base="caroncomb" xOffset="45"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
index 7be16ee7..f8396f05 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="320"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb" xOffset="-7"/>
+    <component base="cedillacomb" xOffset="75"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
index b857fa17..da053ae9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="413"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-4"/>
+    <component base="circumflexcomb" xOffset="42"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
index 850a6d1e..8ccc165d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="285"/>
+  <advance width="225"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
index 6ddeab1c..34ff3dec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="538"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-7"/>
+    <component base="dieresiscomb" xOffset="-19"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
index 897b00e1..7a19b5f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="288"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="-28"/>
+    <component base="dotaccentcomb" xOffset="106"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
index 92601d3d..3d037877 100644
--- a/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="571"/>
+  <advance width="456"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/estimated.glif b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
index afe8ce94..6f4e3400 100644
--- a/src/Cantarell-Bold.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="787"/>
+  <advance width="767"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="397" y="-10" type="curve" smooth="yes"/>
-      <point x="528" y="-10"/>
-      <point x="652" y="42"/>
-      <point x="724" y="119" type="curve"/>
-      <point x="658" y="119" type="line"/>
-      <point x="586" y="62"/>
-      <point x="494" y="36"/>
-      <point x="405" y="36" type="curve" smooth="yes"/>
-      <point x="283" y="36"/>
-      <point x="209" y="84"/>
-      <point x="162" y="145" type="curve"/>
-      <point x="162" y="315" type="line"/>
-      <point x="745" y="315" type="line"/>
-      <point x="745" y="545"/>
-      <point x="628" y="704"/>
-      <point x="400" y="704" type="curve" smooth="yes"/>
-      <point x="169" y="704"/>
-      <point x="51" y="541"/>
-      <point x="51" y="339" type="curve" smooth="yes"/>
-      <point x="51" y="123"/>
-      <point x="187" y="-10"/>
+      <point x="387" y="-10" type="curve" smooth="yes"/>
+      <point x="518" y="-10"/>
+      <point x="642" y="42"/>
+      <point x="714" y="119" type="curve"/>
+      <point x="648" y="119" type="line"/>
+      <point x="576" y="62"/>
+      <point x="484" y="36"/>
+      <point x="395" y="36" type="curve" smooth="yes"/>
+      <point x="273" y="36"/>
+      <point x="199" y="84"/>
+      <point x="152" y="145" type="curve"/>
+      <point x="152" y="315" type="line"/>
+      <point x="735" y="315" type="line"/>
+      <point x="735" y="545"/>
+      <point x="618" y="704"/>
+      <point x="390" y="704" type="curve" smooth="yes"/>
+      <point x="159" y="704"/>
+      <point x="41" y="541"/>
+      <point x="41" y="339" type="curve" smooth="yes"/>
+      <point x="41" y="123"/>
+      <point x="177" y="-10"/>
     </contour>
     <contour>
-      <point x="162" y="358" type="line"/>
-      <point x="162" y="535" type="line"/>
-      <point x="208" y="619"/>
-      <point x="283" y="662"/>
-      <point x="397" y="662" type="curve" smooth="yes"/>
-      <point x="511" y="662"/>
-      <point x="585" y="619"/>
-      <point x="631" y="535" type="curve"/>
-      <point x="631" y="358" type="line"/>
+      <point x="152" y="358" type="line"/>
+      <point x="152" y="535" type="line"/>
+      <point x="198" y="619"/>
+      <point x="273" y="662"/>
+      <point x="387" y="662" type="curve" smooth="yes"/>
+      <point x="501" y="662"/>
+      <point x="575" y="619"/>
+      <point x="621" y="535" type="curve"/>
+      <point x="621" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
index 1471cea5..1a22ffa3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="477"/>
+  <advance width="424"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
index 11deacef..81245630 100644
--- a/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="287"/>
+  <advance width="203"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-43"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/grave.glif b/src/Cantarell-Bold.ufo/glyphs/grave.glif
index c727ab8f..eb845fb0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="287"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb" xOffset="9"/>
+    <component base="gravecomb" xOffset="108"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif b/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
index a3eb7cf3..0b022a7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="517"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-44"/>
+    <component base="hungarumlautcomb" xOffset="-1"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
index 271ab700..2ae8c36e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ie-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="ie-cy" format="2">
   <advance width="546"/>
   <unicode hex="0435"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
index b8ca3676..341bf594 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iebreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="30"/>
+    <component base="brevecomb-cy" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
index bd18fba4..82658763 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iegrave-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="65"/>
+    <component base="gravecomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
index 737db519..8c52725d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/io-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="-6"/>
+    <component base="dieresiscomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/macron.glif b/src/Cantarell-Bold.ufo/glyphs/macron.glif
index 84d14063..62365e59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="477"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-6"/>
+    <component base="macroncomb" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
index 1b7dcba4..6be29358 100644
--- a/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/o-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="o-cy" format="2">
   <advance width="597"/>
   <unicode hex="043E"/>
-  <anchor x="284" y="490" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
index f17656c0..398f6dfe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/odieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="15"/>
+    <component base="dieresiscomb" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
index 401eb8b9..9743b669 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-132"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
index 92047dd4..86575919 100644
--- a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
@@ -4,10 +4,10 @@
   <unicode hex="00B1"/>
   <outline>
     <contour>
-      <point x="56" y="321" type="line"/>
-      <point x="545" y="321" type="line"/>
-      <point x="545" y="469" type="line"/>
-      <point x="56" y="469" type="line"/>
+      <point x="223" y="171" type="line"/>
+      <point x="373" y="171" type="line"/>
+      <point x="373" y="624" type="line"/>
+      <point x="223" y="624" type="line"/>
     </contour>
     <contour>
       <point x="61" y="2" type="line"/>
@@ -16,10 +16,10 @@
       <point x="61" y="140" type="line"/>
     </contour>
     <contour>
-      <point x="223" y="171" type="line"/>
-      <point x="373" y="171" type="line"/>
-      <point x="373" y="624" type="line"/>
-      <point x="223" y="624" type="line"/>
+      <point x="56" y="321" type="line"/>
+      <point x="545" y="321" type="line"/>
+      <point x="545" y="469" type="line"/>
+      <point x="56" y="469" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/primemod.glif b/src/Cantarell-Bold.ufo/glyphs/primemod.glif
index 5462a835..c534eef5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="341"/>
+  <advance width="226"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/registered.glif b/src/Cantarell-Bold.ufo/glyphs/registered.glif
index 4a1d39aa..3001324c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/registered.glif
@@ -25,9 +25,9 @@
     </contour>
     <contour>
       <point x="353" y="380" type="line"/>
-      <point x="275" y="516" type="line"/>
-      <point x="369" y="516" type="line"/>
       <point x="450" y="380" type="line"/>
+      <point x="369" y="516" type="line"/>
+      <point x="275" y="516" type="line"/>
     </contour>
     <contour>
       <point x="314" y="336" type="curve" smooth="yes"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ring.glif b/src/Cantarell-Bold.ufo/glyphs/ring.glif
index 838f010a..2b216710 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="332"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb"/>
+    <component base="ringcomb" xOffset="83"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif b/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
index 9811999c..ccc5f1c2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="232"/>
+  <advance width="176"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="232"/>
+    <component base="ringhalfright" xScale="-1" xOffset="176"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
index a57a8dfb..0b38f261 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="233"/>
+  <advance width="176"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="57" y="548" type="line"/>
-      <point x="146" y="549"/>
-      <point x="193" y="587"/>
-      <point x="193" y="659" type="curve" smooth="yes"/>
-      <point x="193" y="729"/>
-      <point x="146" y="766"/>
-      <point x="57" y="766" type="curve"/>
-      <point x="57" y="687" type="line"/>
-      <point x="84" y="687"/>
-      <point x="98" y="677"/>
-      <point x="98" y="658" type="curve" smooth="yes"/>
-      <point x="98" y="639"/>
-      <point x="83" y="628"/>
-      <point x="57" y="627" type="curve"/>
+      <point x="27" y="548" type="line"/>
+      <point x="116" y="549"/>
+      <point x="163" y="587"/>
+      <point x="163" y="659" type="curve" smooth="yes"/>
+      <point x="163" y="729"/>
+      <point x="116" y="766"/>
+      <point x="27" y="766" type="curve"/>
+      <point x="27" y="687" type="line"/>
+      <point x="54" y="687"/>
+      <point x="68" y="677"/>
+      <point x="68" y="658" type="curve" smooth="yes"/>
+      <point x="68" y="639"/>
+      <point x="53" y="628"/>
+      <point x="27" y="627" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
index f683199c..9539b6c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="287"/>
+  <advance width="203"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/te-cy.glif b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
index 37aab80e..e1dff285 100644
--- a/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/te-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="te-cy" format="2">
   <advance width="514"/>
   <unicode hex="0442"/>
-  <anchor x="487" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="176" y="0" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tilde.glif b/src/Cantarell-Bold.ufo/glyphs/tilde.glif
index 85ee6bb0..4fc22983 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-2"/>
+    <component base="tildecomb" xOffset="14"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
index b589c9fc..69f77cb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="u-cy" format="2">
   <advance width="538"/>
   <unicode hex="0443"/>
-  <anchor x="266" y="490" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
index 286be27f..6df39061 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="-3"/>
+    <component base="dieresiscomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
index 0bf5a96b..8d796776 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="51"/>
+    <component base="hungarumlautcomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
index a785a14d..6d78af7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="24"/>
+    <component base="macroncomb" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
index 20aab1c5..173b9820 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="33"/>
+    <component base="brevecomb-cy" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
index 760bf970..035e3231 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ve-cy.glif
@@ -22,22 +22,22 @@
       <point x="338" y="112"/>
       <point x="312" y="112" type="curve" smooth="yes"/>
       <point x="227" y="112" type="line"/>
-      <point x="227" y="378" type="line"/>
-      <point x="283" y="378" type="line" smooth="yes"/>
-      <point x="311" y="378"/>
-      <point x="330" y="367"/>
-      <point x="330" y="337" type="curve" smooth="yes"/>
-      <point x="330" y="311"/>
-      <point x="314" y="295"/>
-      <point x="279" y="286" type="curve"/>
-      <point x="412" y="265" type="line"/>
-      <point x="465" y="281"/>
-      <point x="493" y="319"/>
-      <point x="493" y="373" type="curve" smooth="yes"/>
-      <point x="493" y="451"/>
-      <point x="433" y="490"/>
-      <point x="314" y="490" type="curve" smooth="yes"/>
-      <point x="62" y="490" type="line"/>
+      <point x="227" y="380" type="line"/>
+      <point x="283" y="380" type="line" smooth="yes"/>
+      <point x="311" y="380"/>
+      <point x="330" y="369"/>
+      <point x="330" y="339" type="curve" smooth="yes"/>
+      <point x="330" y="313"/>
+      <point x="314" y="297"/>
+      <point x="279" y="288" type="curve"/>
+      <point x="412" y="267" type="line"/>
+      <point x="465" y="283"/>
+      <point x="493" y="321"/>
+      <point x="493" y="375" type="curve" smooth="yes"/>
+      <point x="493" y="453"/>
+      <point x="433" y="492"/>
+      <point x="314" y="492" type="curve" smooth="yes"/>
+      <point x="62" y="492" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
index e80f0e49..e54fcdda 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="224"/>
+  <advance width="189"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
index bf2fc3b2..a52e092e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="224"/>
+  <advance width="189"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/features.fea b/src/Cantarell-Light.ufo/features.fea
index 90a096d1..6cc69ea6 100644
--- a/src/Cantarell-Light.ufo/features.fea
+++ b/src/Cantarell-Light.ufo/features.fea
@@ -4,17 +4,17 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
@@ -76,35 +76,39 @@ lookup ccmp_Other_3 {
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -296,6 +300,7 @@ sub descender-cy by descender-cy.case;
 
 feature liga {
 # automatic
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -303,9 +308,9 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero by zero.zero;
 
 } zero;
 
diff --git a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
index 2fa0b933..6a126342 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_.glif b/src/Cantarell-Light.ufo/glyphs/A_.glif
index 758e9984..b1d2bf44 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_.glif
@@ -1,29 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0041"/>
   <note>
 A
 </note>
-  <anchor x="326" y="0" name="bottom"/>
-  <anchor x="588" y="10" name="ogonek"/>
-  <anchor x="329" y="694" name="top"/>
+  <anchor x="322" y="0" name="bottom"/>
+  <anchor x="584" y="10" name="ogonek"/>
+  <anchor x="325" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="66" y="0" type="line"/>
-      <point x="329" y="676" type="line"/>
+      <point x="40" y="0" type="line"/>
+      <point x="62" y="0" type="line"/>
       <point x="325" y="676" type="line"/>
-      <point x="570" y="0" type="line"/>
-      <point x="594" y="0" type="line"/>
-      <point x="340" y="694" type="line"/>
-      <point x="317" y="694" type="line"/>
+      <point x="321" y="676" type="line"/>
+      <point x="566" y="0" type="line"/>
+      <point x="590" y="0" type="line"/>
+      <point x="336" y="694" type="line"/>
+      <point x="313" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="153" y="249" type="line"/>
-      <point x="493" y="249" type="line"/>
-      <point x="487" y="268" type="line"/>
-      <point x="158" y="268" type="line"/>
+      <point x="149" y="249" type="line"/>
+      <point x="489" y="249" type="line"/>
+      <point x="483" y="268" type="line"/>
+      <point x="154" y="268" 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/A_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
index 50afec94..64ec6867 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="271"/>
+    <component base="acutecomb.case" xOffset="267"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
index 34c4ad7b..aa68e5f9 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="136"/>
+    <component base="brevecomb-cy.case" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve.glif b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
index 5e4ea712..676c26ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="126"/>
+    <component base="brevecomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
index d6ad8959..20dd6798 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="254" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="117" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="250" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
index 79d8a0f1..f57cafc4 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="206"/>
-    <component base="brevecomb.case" xOffset="126"/>
+    <component base="dotbelowcomb" xOffset="202"/>
+    <component base="brevecomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
index 40c4ffc4..8275da53 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="150" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="117" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="146" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
index 4323af02..60e56b8f 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="181" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="117" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="177" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
index c1ddee4c..f55bab1c 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="92" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="117" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="88" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_caron.glif b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
index 30931825..73aa6d64 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="154"/>
+    <component base="caroncomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
index 9628e356..a6ce2c3c 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="152"/>
+    <component base="circumflexcomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
index 8db82199..19cde748 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="372" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="149" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="368" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
index 749090b8..780d50d3 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="206"/>
-    <component base="circumflexcomb.case" xOffset="152"/>
+    <component base="dotbelowcomb" xOffset="202"/>
+    <component base="circumflexcomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
index 991c2a80..2d1446ec 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="268" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="149" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="264" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
index 16e22fe1..8ecd1252 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="299" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="149" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="295" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
index 46957cb2..b6f2dd06 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="102" yOffset="294"/>
+    <component base="circumflexcomb.loclVIET" xOffset="149" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="98" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
index 8e1e202d..15d8a4aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="86"/>
+    <component base="dblgravecomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
index 297bdd8b..f81d3c23 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="109"/>
+    <component base="dieresiscomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
index a0e05b75..dff61b10 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="109"/>
+    <component base="dieresiscomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
index dcfa0a21..21000ce9 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="206"/>
+    <component base="dotbelowcomb" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_grave.glif b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
index a3d61103..34f0fee1 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="132"/>
+    <component base="gravecomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
index 0291de53..003504f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="174"/>
+    <component base="hookabovecomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
index 5ee713a2..aeba5a47 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="123"/>
+    <component base="breveinvertedcomb.case" xOffset="119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_macron.glif b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
index aabe29bd..50776924 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="91"/>
+    <component base="macroncomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
index 75cc7ca9..659d0cbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="187"/>
+    <component base="ogonekcomb" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ring.glif b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
index 90cba37f..862b03ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="155"/>
+    <component base="ringcomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
index 37086c89..07c2fd6e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="170"/>
+    <component base="ringcomb_acutecomb.case" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
index d7d89985..ccae39aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="639"/>
+  <advance width="630"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="85"/>
+    <component base="tildecomb.case" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_.glif b/src/Cantarell-Light.ufo/glyphs/B_.glif
index 9b7731af..28836cec 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="641"/>
+  <advance width="635"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="280" y="0" name="bottom"/>
-  <anchor x="280" y="694" name="top"/>
+  <anchor x="277" y="0" name="bottom"/>
+  <anchor x="277" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="332" y="0" type="line" smooth="yes"/>
-      <point x="486" y="0"/>
-      <point x="570" y="68"/>
-      <point x="570" y="185" type="curve" smooth="yes"/>
-      <point x="570" y="300"/>
-      <point x="488" y="373"/>
-      <point x="366" y="373" type="curve" smooth="yes"/>
-      <point x="137" y="373" type="line"/>
-      <point x="137" y="356" type="line"/>
-      <point x="356" y="356" type="line" smooth="yes"/>
-      <point x="475" y="356"/>
-      <point x="548" y="288"/>
-      <point x="548" y="181" type="curve" smooth="yes"/>
-      <point x="548" y="75"/>
-      <point x="477" y="18"/>
-      <point x="343" y="18" type="curve" smooth="yes"/>
-      <point x="143" y="18" type="line"/>
-      <point x="143" y="676" type="line"/>
-      <point x="299" y="676" type="line" smooth="yes"/>
-      <point x="427" y="676"/>
-      <point x="497" y="622"/>
-      <point x="497" y="521" type="curve" smooth="yes"/>
-      <point x="497" y="442"/>
-      <point x="454" y="388"/>
-      <point x="370" y="369" type="curve"/>
-      <point x="396" y="365" type="line"/>
-      <point x="470" y="379"/>
-      <point x="519" y="444"/>
-      <point x="519" y="528" type="curve" smooth="yes"/>
-      <point x="519" y="635"/>
-      <point x="440" y="694"/>
-      <point x="299" y="694" type="curve" smooth="yes"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="329" y="0" type="line" smooth="yes"/>
+      <point x="483" y="0"/>
+      <point x="567" y="68"/>
+      <point x="567" y="185" type="curve" smooth="yes"/>
+      <point x="567" y="300"/>
+      <point x="485" y="373"/>
+      <point x="363" y="373" type="curve" smooth="yes"/>
+      <point x="134" y="373" type="line"/>
+      <point x="134" y="356" type="line"/>
+      <point x="353" y="356" type="line" smooth="yes"/>
+      <point x="472" y="356"/>
+      <point x="545" y="288"/>
+      <point x="545" y="181" type="curve" smooth="yes"/>
+      <point x="545" y="75"/>
+      <point x="474" y="18"/>
+      <point x="340" y="18" type="curve" smooth="yes"/>
+      <point x="140" y="18" type="line"/>
+      <point x="140" y="676" type="line"/>
+      <point x="296" y="676" type="line" smooth="yes"/>
+      <point x="424" y="676"/>
+      <point x="494" y="622"/>
+      <point x="494" y="521" type="curve" smooth="yes"/>
+      <point x="494" y="442"/>
+      <point x="451" y="388"/>
+      <point x="367" y="369" type="curve"/>
+      <point x="393" y="365" type="line"/>
+      <point x="467" y="379"/>
+      <point x="516" y="444"/>
+      <point x="516" y="528" type="curve" smooth="yes"/>
+      <point x="516" y="635"/>
+      <point x="437" y="694"/>
+      <point x="296" y="694" type="curve" smooth="yes"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
index e5ade8cd..80b64cb7 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_e-cy.glif
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Be-cy" format="2">
-  <advance width="627"/>
+  <advance width="624"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="331" y="0" type="line" smooth="yes"/>
-      <point x="476" y="0"/>
-      <point x="559" y="71"/>
-      <point x="559" y="195" type="curve" smooth="yes"/>
-      <point x="559" y="317"/>
-      <point x="484" y="393"/>
-      <point x="365" y="393" type="curve" smooth="yes"/>
-      <point x="137" y="393" type="line"/>
-      <point x="137" y="376" type="line"/>
-      <point x="355" y="376" type="line" smooth="yes"/>
-      <point x="467" y="376"/>
-      <point x="537" y="305"/>
-      <point x="537" y="191" type="curve" smooth="yes"/>
-      <point x="537" y="78"/>
-      <point x="469" y="18"/>
-      <point x="342" y="18" type="curve" smooth="yes"/>
-      <point x="145" y="18" type="line"/>
-      <point x="145" y="676" type="line"/>
-      <point x="489" y="676" type="line"/>
-      <point x="489" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="328" y="0" type="line" smooth="yes"/>
+      <point x="473" y="0"/>
+      <point x="556" y="71"/>
+      <point x="556" y="195" type="curve" smooth="yes"/>
+      <point x="556" y="317"/>
+      <point x="481" y="393"/>
+      <point x="362" y="393" type="curve" smooth="yes"/>
+      <point x="134" y="393" type="line"/>
+      <point x="134" y="376" type="line"/>
+      <point x="352" y="376" type="line" smooth="yes"/>
+      <point x="464" y="376"/>
+      <point x="534" y="305"/>
+      <point x="534" y="191" type="curve" smooth="yes"/>
+      <point x="534" y="78"/>
+      <point x="466" y="18"/>
+      <point x="339" y="18" type="curve" smooth="yes"/>
+      <point x="142" y="18" type="line"/>
+      <point x="142" y="676" type="line"/>
+      <point x="486" y="676" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
index f20a4e23..1f30b8d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Che-cy" format="2">
-  <advance width="638"/>
+  <advance width="635"/>
   <unicode hex="0427"/>
   <anchor x="535" y="0" name="bottomright"/>
   <anchor x="318" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
index 4aca1120..6acabfd3 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedescender-cy" format="2">
-  <advance width="638"/>
+  <advance width="635"/>
   <unicode hex="04B6"/>
   <outline>
     <component base="Che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
index 4ed977c4..d6086743 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chedieresis-cy" format="2">
-  <advance width="638"/>
+  <advance width="635"/>
   <unicode hex="04F4"/>
   <outline>
     <component base="Che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
index 0ed252ed..51cb1f8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hekhakassian-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chekhakassian-cy" format="2">
-  <advance width="638"/>
+  <advance width="635"/>
   <unicode hex="04CB"/>
   <outline>
     <component base="Che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
index 1c095466..97ae8aee 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_heverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cheverticalstroke-cy" format="2">
-  <advance width="658"/>
+  <advance width="655"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_.glif b/src/Cantarell-Light.ufo/glyphs/D_.glif
index dccaf744..dc9ce0c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="0044"/>
   <note>
 D
 </note>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="186" y="364" name="center"/>
-  <anchor x="343" y="694" name="top"/>
+  <anchor x="350" y="0" name="bottom"/>
+  <anchor x="183" y="364" name="center"/>
+  <anchor x="340" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="286" y="0" type="line" smooth="yes"/>
-      <point x="504" y="0"/>
-      <point x="634" y="131"/>
-      <point x="634" y="353" type="curve" smooth="yes"/>
-      <point x="634" y="573"/>
-      <point x="513" y="694"/>
-      <point x="292" y="694" type="curve" smooth="yes"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="283" y="0" type="line" smooth="yes"/>
+      <point x="501" y="0"/>
+      <point x="631" y="131"/>
+      <point x="631" y="353" type="curve" smooth="yes"/>
+      <point x="631" y="573"/>
+      <point x="510" y="694"/>
+      <point x="289" y="694" type="curve" smooth="yes"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="145" y="18" type="line"/>
-      <point x="145" y="676" type="line"/>
-      <point x="286" y="676" type="line" smooth="yes"/>
-      <point x="500" y="676"/>
-      <point x="612" y="564"/>
-      <point x="612" y="348" type="curve" smooth="yes"/>
-      <point x="612" y="138"/>
-      <point x="496" y="18"/>
-      <point x="292" y="18" type="curve" smooth="yes"/>
+      <point x="142" y="18" type="line"/>
+      <point x="142" y="676" type="line"/>
+      <point x="283" y="676" type="line" smooth="yes"/>
+      <point x="497" y="676"/>
+      <point x="609" y="564"/>
+      <point x="609" y="348" type="curve" smooth="yes"/>
+      <point x="609" y="138"/>
+      <point x="493" y="18"/>
+      <point x="289" y="18" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
index 1b99a3e9..8525b399 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1334"/>
+  <advance width="1327"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="706"/>
+    <component base="Zcaron" xOffset="703"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
index 311f3604..dfea9f7c 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="168"/>
+    <component base="caroncomb.case" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_croat.glif b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
index 42afd576..cc3181ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
index a56c25de..dae451ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="233"/>
+    <component base="dotbelowcomb" xOffset="230"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
index d77ee27f..d7fa988a 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_e-cy.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="De-cy" format="2">
-  <advance width="702"/>
+  <advance width="696"/>
   <unicode hex="0414"/>
   <outline>
     <contour>
-      <point x="72" y="2" type="line"/>
-      <point x="178" y="2"/>
-      <point x="233" y="141"/>
-      <point x="233" y="407" type="curve" smooth="yes"/>
-      <point x="233" y="675" type="line"/>
-      <point x="551" y="675" type="line"/>
-      <point x="551" y="6" type="line"/>
-      <point x="573" y="6" type="line"/>
-      <point x="573" y="694" type="line"/>
-      <point x="211" y="694" type="line"/>
-      <point x="211" y="409" type="line" smooth="yes"/>
-      <point x="211" y="153"/>
-      <point x="163" y="19"/>
-      <point x="70" y="19" type="curve"/>
+      <point x="69" y="2" type="line"/>
+      <point x="175" y="2"/>
+      <point x="230" y="141"/>
+      <point x="230" y="407" type="curve" smooth="yes"/>
+      <point x="230" y="675" type="line"/>
+      <point x="548" y="675" type="line"/>
+      <point x="548" y="6" type="line"/>
+      <point x="570" y="6" type="line"/>
+      <point x="570" y="694" type="line"/>
+      <point x="208" y="694" type="line"/>
+      <point x="208" y="409" type="line" smooth="yes"/>
+      <point x="208" y="153"/>
+      <point x="160" y="19"/>
+      <point x="67" y="19" type="curve"/>
     </contour>
     <contour>
-      <point x="44" y="-175" type="line"/>
-      <point x="65" y="-175" type="line"/>
-      <point x="65" y="0" type="line"/>
-      <point x="628" y="0" type="line"/>
-      <point x="628" y="-175" type="line"/>
-      <point x="649" y="-175" type="line"/>
-      <point x="649" y="19" type="line"/>
-      <point x="44" y="19" type="line"/>
+      <point x="41" y="-175" type="line"/>
+      <point x="62" y="-175" type="line"/>
+      <point x="62" y="0" type="line"/>
+      <point x="625" y="0" type="line"/>
+      <point x="625" y="-175" type="line"/>
+      <point x="646" y="-175" type="line"/>
+      <point x="646" y="19" type="line"/>
+      <point x="41" y="19" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
index 797b79d7..16f2080f 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dje-cy" format="2">
-  <advance width="770"/>
+  <advance width="768"/>
   <unicode hex="0402"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
index d0a068d3..f7a8a9db 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="103"/>
+    <component base="macronbelowcomb" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
index 4d2b44e2..aad3bc22 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1157"/>
+  <advance width="1154"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="706"/>
+    <component base="zcaron" xOffset="703"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_ze-cy.glif
index d828d477..1f225950 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="586"/>
+  <advance width="559"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
index 535f1b9b..54ecc29d 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_zhe-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzhe-cy" format="2">
-  <advance width="726"/>
+  <advance width="720"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="358" y="-175" type="line"/>
-      <point x="379" y="-175" type="line"/>
-      <point x="379" y="0" type="line"/>
-      <point x="603" y="0" type="line"/>
-      <point x="603" y="694" type="line"/>
-      <point x="582" y="694" type="line"/>
-      <point x="582" y="19" type="line"/>
-      <point x="145" y="19" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="358" y="0" type="line"/>
+      <point x="355" y="-175" type="line"/>
+      <point x="376" y="-175" type="line"/>
+      <point x="376" y="0" type="line"/>
+      <point x="600" y="0" type="line"/>
+      <point x="600" y="694" type="line"/>
+      <point x="579" y="694" type="line"/>
+      <point x="579" y="19" type="line"/>
+      <point x="142" y="19" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="355" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index 9d368c57..458893b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_.glif
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="317" y="0" name="bottom"/>
-  <anchor x="511" y="10" name="ogonek"/>
-  <anchor x="316" y="694" name="top"/>
-  <anchor x="6" y="694" name="topleft"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="508" y="10" name="ogonek"/>
+  <anchor x="323" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="517" y="0" type="line"/>
-      <point x="517" y="18" type="line"/>
-      <point x="144" y="18" type="line"/>
-      <point x="144" y="355" type="line"/>
-      <point x="490" y="355" type="line"/>
-      <point x="490" y="373" type="line"/>
-      <point x="144" y="373" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="517" y="676" type="line"/>
-      <point x="517" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="514" y="0" type="line"/>
+      <point x="514" y="18" type="line"/>
+      <point x="141" y="18" type="line"/>
+      <point x="141" y="355" type="line"/>
+      <point x="487" y="355" type="line"/>
+      <point x="487" y="373" type="line"/>
+      <point x="141" y="373" type="line"/>
+      <point x="141" y="676" type="line"/>
+      <point x="514" y="676" type="line"/>
+      <point x="514" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_acute.glif b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
index cf8205cc..70363d9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="258"/>
+    <component base="acutecomb.case" xOffset="265"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_breve.glif b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
index f995333b..9a079731 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_caron.glif b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
index 33a3b053..2248a7b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="141"/>
+    <component base="caroncomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
index 6c4f1186..53a3995d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="192"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="cedillacomb" xOffset="189"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
index a90fd639..418e5881 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="139"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index d777c7af..9ff11148 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="140" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="359" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="366" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
index 9c5ec18c..82e7c8e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="197"/>
-    <component base="circumflexcomb.case" xOffset="139"/>
+    <component base="dotbelowcomb" xOffset="194"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index c7d60745..9da804cb 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="140" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="255" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="262" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
index a553b309..65219350 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="140" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="286" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="293" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
index 74d50687..d5721e36 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="140" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="89" yOffset="294"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="96" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
index 60a0afd2..2387dad1 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="73"/>
+    <component base="dblgravecomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
index 70e22df4..02de0333 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="96"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
index 6ab34ae9..89e63892 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="197"/>
+    <component base="dotaccentcomb.case" xOffset="204"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
index 4e1809f9..505d7c86 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="197"/>
+    <component base="dotbelowcomb" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_grave.glif b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
index fb6ce66a..a18f6e37 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="119"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
index c8b8e91c..a915cc10 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="161"/>
+    <component base="hookabovecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
index a94ff8d6..cad71904 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="110"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
index 1bbdf82a..d46fae19 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_l-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="El-cy" format="2">
-  <advance width="694"/>
+  <advance width="691"/>
   <unicode hex="041B"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
index 65335cb5..c7c15a96 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Em-cy" format="2">
-  <advance width="861"/>
+  <advance width="855"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macron.glif b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
index 3f6f9a07..be68315c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="78"/>
+    <component base="macroncomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
index e1d36cb1..e3761819 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="78"/>
-    <component base="acutecomb.case" xOffset="258" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="85"/>
+    <component base="acutecomb.case" xOffset="265" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
index a9c51beb..4acc8f01 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="78"/>
-    <component base="gravecomb.case" xOffset="119" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="85"/>
+    <component base="gravecomb.case" xOffset="126" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
index af1eba19..8aa014db 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="041D"/>
   <anchor x="625" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
index c5c34342..076e1735 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ndescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Endescender-cy" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="04A2"/>
   <outline>
     <component base="En-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ng.glif b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
index c9d9fea1..cc8c89f8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="755"/>
+  <advance width="749"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="612" y="-10" type="line"/>
-      <point x="632" y="0" type="line"/>
-      <point x="632" y="694" type="line"/>
-      <point x="612" y="694" type="line"/>
-      <point x="612" y="20" type="line"/>
-      <point x="616" y="20" type="line"/>
-      <point x="152" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="143" y="0" type="line"/>
-      <point x="143" y="674" type="line"/>
-      <point x="141" y="674" type="line"/>
+      <point x="609" y="-10" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="694" type="line"/>
+      <point x="609" y="694" type="line"/>
+      <point x="609" y="20" type="line"/>
+      <point x="613" y="20" type="line"/>
+      <point x="149" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="140" y="674" type="line"/>
+      <point x="138" y="674" type="line"/>
     </contour>
     <contour>
-      <point x="526" y="-230" type="line"/>
-      <point x="590" y="-200"/>
-      <point x="632" y="-117"/>
-      <point x="632" y="-23" type="curve" smooth="yes"/>
-      <point x="632" y="0" type="line"/>
-      <point x="611" y="0" type="line"/>
-      <point x="611" y="-35" type="line" smooth="yes"/>
-      <point x="611" y="-112"/>
-      <point x="575" y="-186"/>
-      <point x="521" y="-220" type="curve"/>
+      <point x="523" y="-230" type="line"/>
+      <point x="587" y="-200"/>
+      <point x="629" y="-117"/>
+      <point x="629" y="-23" type="curve" smooth="yes"/>
+      <point x="629" y="0" type="line"/>
+      <point x="608" y="0" type="line"/>
+      <point x="608" y="-35" type="line" smooth="yes"/>
+      <point x="608" y="-112"/>
+      <point x="572" y="-186"/>
+      <point x="518" y="-220" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
index 63aa0fb3..98faf5e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_nghe-cy.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Enghe-cy" format="2">
-  <advance width="902"/>
+  <advance width="899"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
-      <point x="583" y="0" type="line"/>
-      <point x="605" y="0" type="line"/>
-      <point x="605" y="676" type="line"/>
-      <point x="867" y="676" type="line"/>
-      <point x="867" y="694" type="line"/>
-      <point x="583" y="694" type="line"/>
+      <point x="580" y="0" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="602" y="676" type="line"/>
+      <point x="864" y="676" type="line"/>
+      <point x="864" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="138" y="352" type="line"/>
-      <point x="589" y="352" type="line"/>
-      <point x="589" y="371" type="line"/>
-      <point x="138" y="371" type="line"/>
+      <point x="135" y="352" type="line"/>
+      <point x="586" y="352" type="line"/>
+      <point x="586" y="371" type="line"/>
+      <point x="135" y="371" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
index 9896f90b..8ed3ad01 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0118"/>
   <anchor x="285" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="110"/>
+    <component base="ogonekcomb" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_r-cy.glif
index 30415ef7..13220a3f 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="588"/>
+  <advance width="583"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_th.glif b/src/Cantarell-Light.ufo/glyphs/E_th.glif
index 0a6527c2..833a9ad5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="706"/>
+  <advance width="703"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-55" yOffset="65"/>
+    <component base="strokeshortcomb.case" xOffset="-58" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
index 478b1fc2..143b1931 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="72"/>
+    <component base="tildecomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index e173bf36..6f9f6c28 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="560"/>
+  <advance width="548"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="694" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="366" type="line"/>
-      <point x="486" y="366" type="line"/>
-      <point x="486" y="384" type="line"/>
-      <point x="145" y="384" type="line"/>
-      <point x="145" y="676" type="line"/>
-      <point x="510" y="676" type="line"/>
-      <point x="510" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="366" type="line"/>
+      <point x="483" y="366" type="line"/>
+      <point x="483" y="384" type="line"/>
+      <point x="142" y="384" type="line"/>
+      <point x="142" y="676" type="line"/>
+      <point x="507" y="676" type="line"/>
+      <point x="507" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_.glif b/src/Cantarell-Light.ufo/glyphs/G_.glif
index ceca6bf3..c5be39ee 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="730"/>
+  <advance width="727"/>
   <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 df0d9795..686946b0 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="730"/>
+  <advance width="727"/>
   <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 bd0c42f2..0aa5a5d0 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="730"/>
+  <advance width="727"/>
   <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 49076844..9b110155 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="730"/>
+  <advance width="727"/>
   <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 7df62b07..17bf744d 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="730"/>
+  <advance width="727"/>
   <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 0837ce57..3e1dc758 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="730"/>
+  <advance width="727"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
index 83964110..666afb81 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ge-cy" format="2">
-  <advance width="535"/>
+  <advance width="532"/>
   <unicode hex="0413"/>
-  <anchor x="165" y="0" name="bottomright"/>
-  <anchor x="278" y="694" name="top"/>
+  <anchor x="162" y="0" name="bottomright"/>
+  <anchor x="275" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="676" type="line"/>
-      <point x="500" y="676" type="line"/>
-      <point x="500" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="676" type="line"/>
+      <point x="497" y="676" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
index 5973f712..db26bf6a 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gedescender-cy" format="2">
-  <advance width="535"/>
+  <advance width="532"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="69"/>
+    <component base="descender-cy.case" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
index 12dfab07..ceeaa10f 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hemiddlehook-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghemiddlehook-cy" format="2">
-  <advance width="654"/>
+  <advance width="648"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
-      <point x="266" y="-231" type="line"/>
-      <point x="457" y="-214"/>
-      <point x="584" y="-77"/>
-      <point x="584" y="111" type="curve" smooth="yes"/>
-      <point x="584" y="286"/>
-      <point x="494" y="391"/>
-      <point x="345" y="391" type="curve" smooth="yes"/>
-      <point x="262" y="391"/>
-      <point x="176" y="357"/>
-      <point x="130" y="305" type="curve"/>
-      <point x="140" y="294" type="line"/>
-      <point x="183" y="341"/>
-      <point x="264" y="373"/>
-      <point x="341" y="373" type="curve" smooth="yes"/>
-      <point x="480" y="373"/>
-      <point x="563" y="274"/>
-      <point x="563" y="110" type="curve" smooth="yes"/>
-      <point x="563" y="-68"/>
-      <point x="444" y="-200"/>
-      <point x="265" y="-219" type="curve"/>
+      <point x="263" y="-231" type="line"/>
+      <point x="454" y="-214"/>
+      <point x="581" y="-77"/>
+      <point x="581" y="111" type="curve" smooth="yes"/>
+      <point x="581" y="286"/>
+      <point x="491" y="391"/>
+      <point x="342" y="391" type="curve" smooth="yes"/>
+      <point x="259" y="391"/>
+      <point x="173" y="357"/>
+      <point x="127" y="305" type="curve"/>
+      <point x="137" y="294" type="line"/>
+      <point x="180" y="341"/>
+      <point x="261" y="373"/>
+      <point x="338" y="373" type="curve" smooth="yes"/>
+      <point x="477" y="373"/>
+      <point x="560" y="274"/>
+      <point x="560" y="110" type="curve" smooth="yes"/>
+      <point x="560" y="-68"/>
+      <point x="441" y="-200"/>
+      <point x="262" y="-219" type="curve"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="489" y="676" type="line"/>
-      <point x="489" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="676" type="line"/>
+      <point x="486" y="676" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
index 249a9106..1e2a08ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_hestroke-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ghestroke-cy" format="2">
-  <advance width="545"/>
+  <advance width="542"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="170" y="0" type="line"/>
-      <point x="170" y="676" type="line"/>
-      <point x="510" y="676" type="line"/>
-      <point x="510" y="694" type="line"/>
-      <point x="148" y="694" type="line"/>
+      <point x="145" y="0" type="line"/>
+      <point x="167" y="0" type="line"/>
+      <point x="167" y="676" type="line"/>
+      <point x="507" y="676" type="line"/>
+      <point x="507" y="694" type="line"/>
+      <point x="145" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="66" y="318" type="line"/>
-      <point x="345" y="318" type="line"/>
-      <point x="345" y="335" type="line"/>
-      <point x="66" y="335" type="line"/>
+      <point x="63" y="318" type="line"/>
+      <point x="342" y="318" type="line"/>
+      <point x="342" y="335" type="line"/>
+      <point x="63" y="335" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
index c52a71e9..2f8adc74 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_heupturn-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gheupturn-cy" format="2">
-  <advance width="530"/>
+  <advance width="527"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="676" type="line"/>
-      <point x="495" y="676" type="line"/>
-      <point x="495" y="850" type="line"/>
-      <point x="476" y="850" type="line"/>
-      <point x="476" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="676" type="line"/>
+      <point x="492" y="676" type="line"/>
+      <point x="492" y="850" type="line"/>
+      <point x="473" y="850" type="line"/>
+      <point x="473" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
index 6c9f1d8c..a3820d45 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gje-cy" format="2">
-  <advance width="535"/>
+  <advance width="532"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="220"/>
+    <component base="acutecomb.case" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_macron.glif b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
index 9972b018..0d43f7b8 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="730"/>
+  <advance width="727"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_.glif b/src/Cantarell-Light.ufo/glyphs/H_.glif
index 3032937e..0d11fd50 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_.glif
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="0048"/>
   <note>
 H
 </note>
-  <anchor x="366" y="0" name="bottom"/>
-  <anchor x="366" y="534" name="center"/>
-  <anchor x="366" y="694" name="top"/>
-  <anchor x="15" y="694" name="topleft"/>
+  <anchor x="363" y="0" name="bottom"/>
+  <anchor x="363" y="534" name="center"/>
+  <anchor x="363" y="694" name="top"/>
+  <anchor x="12" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="352" type="line"/>
-      <point x="583" y="352" type="line"/>
-      <point x="583" y="0" type="line"/>
-      <point x="605" y="0" type="line"/>
-      <point x="605" y="694" type="line"/>
-      <point x="583" y="694" type="line"/>
-      <point x="583" y="371" type="line"/>
-      <point x="145" y="371" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="352" type="line"/>
+      <point x="580" y="352" type="line"/>
+      <point x="580" y="0" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="602" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
+      <point x="580" y="371" type="line"/>
+      <point x="142" y="371" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/H_a-cy.glif
index 6bcefdd3..7a0157ff 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="598"/>
+  <advance width="590"/>
   <unicode hex="0425"/>
   <anchor x="537" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
index 75495862..074a4831 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_adescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hadescender-cy" format="2">
-  <advance width="598"/>
+  <advance width="590"/>
   <unicode hex="04B2"/>
   <outline>
     <component base="Ha-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_bar.glif b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
index de03d83a..ff76e229 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-94" yOffset="192"/>
+    <component base="strokelongcomb" xOffset="-97" yOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
index a635ae56..07db06db 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="160"/>
+    <component base="brevebelowcomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
index c98685de..12be0cb7 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="189"/>
+    <component base="circumflexcomb.case" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
index c9cf243e..3098f365 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="728"/>
+  <advance width="722"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="dotbelowcomb" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
index 67023ea0..c492a03a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_.glif b/src/Cantarell-Light.ufo/glyphs/I_.glif
index 58fef368..ac8dcb74 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0049"/>
   <note>
 I
 </note>
-  <anchor x="134" y="0" name="bottom"/>
-  <anchor x="138" y="10" name="ogonek"/>
-  <anchor x="134" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
+  <anchor x="131" y="0" name="bottom"/>
+  <anchor x="135" y="10" name="ogonek"/>
+  <anchor x="131" y="694" name="top"/>
+  <anchor x="4" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
index 9e6fe75e..b952c0cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="631"/>
+  <advance width="607"/>
   <unicode hex="042F"/>
-  <anchor x="313" y="694" name="top"/>
+  <anchor x="292" y="694" name="top"/>
   <outline>
     <contour>
+      <point x="466" y="0" type="line"/>
       <point x="487" y="0" type="line"/>
-      <point x="508" y="0" type="line"/>
-      <point x="508" y="694" type="line"/>
-      <point x="303" y="694" type="line" smooth="yes"/>
-      <point x="163" y="694"/>
-      <point x="78" y="618"/>
-      <point x="78" y="489" type="curve" smooth="yes"/>
-      <point x="78" y="365"/>
-      <point x="162" y="288"/>
-      <point x="298" y="288" type="curve" smooth="yes"/>
-      <point x="497" y="288" type="line"/>
-      <point x="497" y="306" type="line"/>
-      <point x="303" y="306" type="line" smooth="yes"/>
-      <point x="176" y="306"/>
-      <point x="100" y="377"/>
-      <point x="100" y="495" type="curve" smooth="yes"/>
-      <point x="100" y="610"/>
-      <point x="173" y="676"/>
-      <point x="296" y="676" type="curve" smooth="yes"/>
-      <point x="487" y="676" type="line"/>
+      <point x="487" y="694" type="line"/>
+      <point x="282" y="694" type="line" smooth="yes"/>
+      <point x="142" y="694"/>
+      <point x="57" y="618"/>
+      <point x="57" y="489" type="curve" smooth="yes"/>
+      <point x="57" y="365"/>
+      <point x="141" y="288"/>
+      <point x="277" y="288" type="curve" smooth="yes"/>
+      <point x="476" y="288" type="line"/>
+      <point x="476" y="306" type="line"/>
+      <point x="282" y="306" type="line" smooth="yes"/>
+      <point x="155" y="306"/>
+      <point x="79" y="377"/>
+      <point x="79" y="495" type="curve" smooth="yes"/>
+      <point x="79" y="610"/>
+      <point x="152" y="676"/>
+      <point x="275" y="676" type="curve" smooth="yes"/>
+      <point x="466" y="676" type="line"/>
     </contour>
     <contour>
-      <point x="74" y="0" type="line"/>
-      <point x="99" y="0" type="line"/>
-      <point x="278" y="302" type="line"/>
-      <point x="256" y="302" type="line"/>
+      <point x="53" y="0" type="line"/>
+      <point x="78" y="0" type="line"/>
+      <point x="257" y="302" type="line"/>
+      <point x="235" y="302" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>I</string>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_acute.glif b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
index 4645ed97..19eeb87b 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="76"/>
+    <component base="acutecomb.case" xOffset="73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_breve.glif b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
index cc7f72ad..0a03c583 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-69"/>
+    <component base="brevecomb.case" xOffset="-72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_caron.glif b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
index 977e9881..abadec2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-41"/>
+    <component base="caroncomb.case" xOffset="-44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
index 6920a1de..75a0f5ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-43"/>
+    <component base="circumflexcomb.case" xOffset="-46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
index 1e1645d9..2a86f82a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-109"/>
+    <component base="dblgravecomb.case" xOffset="-112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
index 25aabe54..bd83d8f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis-cy" format="2">
-  <advance width="748"/>
+  <advance width="742"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="154"/>
+    <component base="dieresiscomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
index 3b004d2d..feb89e05 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-86"/>
+    <component base="dieresiscomb.case" xOffset="-89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
index f4777b13..94a0dc25 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-86"/>
-    <component base="acutecomb.case" xOffset="76" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="-89"/>
+    <component base="acutecomb.case" xOffset="73" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
index 07b60d91..8cb8c97c 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="15"/>
+    <component base="dotaccentcomb.case" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
index 84901026..d83cdd77 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="14"/>
+    <component base="dotbelowcomb" xOffset="11"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
index f6c73c7c..7d671fa0 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0415"/>
-  <anchor x="277" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
index 81e1a4a7..f6d5db57 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="84"/>
+    <component base="brevecomb-cy.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
index 42597d2e..9d94bc94 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="80"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_grave.glif b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
index 985bec86..c02e373b 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-63"/>
+    <component base="gravecomb.case" xOffset="-66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
index db161aec..15c63eef 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-21"/>
+    <component base="hookabovecomb.case" xOffset="-24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
index f67654c3..c06389c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_i-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ii-cy" format="2">
-  <advance width="748"/>
+  <advance width="742"/>
   <unicode hex="0418"/>
-  <anchor x="715" y="0" name="bottomright"/>
-  <anchor x="374" y="694" name="top"/>
+  <anchor x="712" y="0" name="bottomright"/>
+  <anchor x="371" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="150" y="0" type="line"/>
-      <point x="606" y="674" type="line"/>
-      <point x="605" y="674" type="line"/>
-      <point x="605" y="0" type="line"/>
-      <point x="625" y="0" type="line"/>
-      <point x="625" y="694" type="line"/>
-      <point x="598" y="694" type="line"/>
-      <point x="141" y="20" type="line"/>
-      <point x="143" y="20" type="line"/>
-      <point x="143" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="147" y="0" type="line"/>
+      <point x="603" y="674" type="line"/>
+      <point x="602" y="674" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="622" y="0" type="line"/>
+      <point x="622" y="694" type="line"/>
+      <point x="595" y="694" type="line"/>
+      <point x="138" y="20" type="line"/>
+      <point x="140" y="20" type="line"/>
+      <point x="140" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
index 2b58c015..3f0d743c 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_igrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iigrave-cy" format="2">
-  <advance width="748"/>
+  <advance width="742"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="177"/>
+    <component base="gravecomb.case" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
index 2c44f5b9..66907cb6 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-72"/>
+    <component base="breveinvertedcomb.case" xOffset="-75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
index c2050d98..236042cb 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iishort-cy" format="2">
-  <advance width="748"/>
+  <advance width="742"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="181"/>
+    <component base="brevecomb-cy.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
index 6c0e44c9..4ebe84b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron-cy" format="2">
-  <advance width="748"/>
+  <advance width="742"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="136"/>
+    <component base="macroncomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_macron.glif b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
index fc1d9627..c63601da 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-78"/>
+    <component base="macroncomb.narrow.case" xOffset="-81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
index d8de4188..7f23999a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="579"/>
+  <advance width="576"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="57"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
index 47b31f02..b8965e29 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-238"/>
+    <component base="ogonekcomb.narrow" xOffset="-241"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
index 9d7a3ff1..1c094a7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-110"/>
+    <component base="tildecomb.case" xOffset="-113"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
index 56c710b8..b7064958 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_u-cy.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iu-cy" format="2">
-  <advance width="972"/>
+  <advance width="969"/>
   <unicode hex="042E"/>
-  <anchor x="493" y="694" name="top"/>
+  <anchor x="490" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="594" y="-10" type="curve" smooth="yes"/>
-      <point x="776" y="-10"/>
-      <point x="900" y="134"/>
-      <point x="900" y="347" type="curve" smooth="yes"/>
-      <point x="900" y="558"/>
-      <point x="779" y="699"/>
-      <point x="598" y="699" type="curve" smooth="yes"/>
-      <point x="420" y="699"/>
-      <point x="309" y="562"/>
-      <point x="309" y="343" type="curve" smooth="yes"/>
-      <point x="309" y="125"/>
-      <point x="418" y="-10"/>
+      <point x="591" y="-10" type="curve" smooth="yes"/>
+      <point x="773" y="-10"/>
+      <point x="897" y="134"/>
+      <point x="897" y="347" type="curve" smooth="yes"/>
+      <point x="897" y="558"/>
+      <point x="776" y="699"/>
+      <point x="595" y="699" type="curve" smooth="yes"/>
+      <point x="417" y="699"/>
+      <point x="306" y="562"/>
+      <point x="306" y="343" type="curve" smooth="yes"/>
+      <point x="306" y="125"/>
+      <point x="415" y="-10"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="138" y="352" type="line"/>
-      <point x="322" y="352" type="line"/>
-      <point x="322" y="371" type="line"/>
-      <point x="138" y="371" type="line"/>
+      <point x="135" y="352" type="line"/>
+      <point x="319" y="352" type="line"/>
+      <point x="319" y="371" type="line"/>
+      <point x="135" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="597" y="9" type="curve" smooth="yes"/>
-      <point x="432" y="9"/>
-      <point x="330" y="137"/>
-      <point x="330" y="346" type="curve" smooth="yes"/>
-      <point x="330" y="556"/>
-      <point x="428" y="680"/>
-      <point x="594" y="680" type="curve" smooth="yes"/>
-      <point x="763" y="680"/>
-      <point x="878" y="543"/>
-      <point x="878" y="342" type="curve" smooth="yes"/>
-      <point x="878" y="142"/>
-      <point x="765" y="9"/>
+      <point x="594" y="9" type="curve" smooth="yes"/>
+      <point x="429" y="9"/>
+      <point x="327" y="137"/>
+      <point x="327" y="346" type="curve" smooth="yes"/>
+      <point x="327" y="556"/>
+      <point x="425" y="680"/>
+      <point x="591" y="680" type="curve" smooth="yes"/>
+      <point x="760" y="680"/>
+      <point x="875" y="543"/>
+      <point x="875" y="342" type="curve" smooth="yes"/>
+      <point x="875" y="142"/>
+      <point x="762" y="9"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_.glif b/src/Cantarell-Light.ufo/glyphs/J_.glif
index 4a7470cc..05e6012f 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="J" format="2">
-  <advance width="393"/>
+  <advance width="390"/>
   <unicode hex="004A"/>
   <note>
 J
diff --git a/src/Cantarell-Light.ufo/glyphs/J_acute.glif b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
index 9de51a80..bb9847e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="393"/>
+  <advance width="390"/>
   <outline>
     <component base="J"/>
     <component base="acutecomb.case" xOffset="209"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
index 464c18c5..0cb5997c 100644
--- a/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/J_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="393"/>
+  <advance width="390"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/J_e-cy.glif
index dadb1602..a0642c55 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="393"/>
+  <advance width="390"/>
   <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 25bd7fd5..7c610d74 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="578"/>
+  <advance width="573"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="296" y="0" name="bottom"/>
-  <anchor x="296" y="694" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="510" y="0" type="line"/>
-      <point x="540" y="0" type="line"/>
-      <point x="164" y="366" type="line"/>
-      <point x="164" y="356" type="line"/>
-      <point x="526" y="694" type="line"/>
-      <point x="497" y="694" type="line"/>
-      <point x="145" y="360" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="537" y="0" type="line"/>
+      <point x="161" y="366" type="line"/>
+      <point x="161" y="356" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="494" y="694" type="line"/>
+      <point x="142" y="360" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="143" y="0" type="line"/>
-      <point x="143" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="140" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
index 27560541..d87518d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_a-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ka-cy" format="2">
-  <advance width="627"/>
+  <advance width="624"/>
   <unicode hex="041A"/>
-  <anchor x="588" y="0" name="bottomright"/>
-  <anchor x="322" y="694" name="top"/>
+  <anchor x="585" y="0" name="bottomright"/>
+  <anchor x="319" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="568" y="0" type="line"/>
-      <point x="593" y="0" type="line"/>
-      <point x="298" y="364" type="line"/>
-      <point x="298" y="353" type="line"/>
-      <point x="578" y="694" type="line"/>
-      <point x="554" y="694" type="line"/>
-      <point x="279" y="357" type="line"/>
+      <point x="565" y="0" type="line"/>
+      <point x="590" y="0" type="line"/>
+      <point x="295" y="364" type="line"/>
+      <point x="295" y="353" type="line"/>
+      <point x="575" y="694" type="line"/>
+      <point x="551" y="694" type="line"/>
+      <point x="276" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="143" y="0" type="line"/>
-      <point x="143" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="140" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="132" y="348" type="line"/>
-      <point x="293" y="348" type="line"/>
-      <point x="293" y="366" type="line"/>
-      <point x="132" y="366" type="line"/>
+      <point x="129" y="348" type="line"/>
+      <point x="290" y="348" type="line"/>
+      <point x="290" y="366" type="line"/>
+      <point x="129" y="366" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_acute.glif b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
index 47709b67..63a81d6e 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="578"/>
+  <advance width="573"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="238"/>
+    <component base="acutecomb.case" xOffset="235"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
index 34d9297e..1dbc7bf9 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kadescender-cy" format="2">
-  <advance width="627"/>
+  <advance width="624"/>
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="492"/>
+    <component base="descender-cy.case" xOffset="489"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
index f29b0caf..9dd4278c 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_averticalstroke-cy.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kaverticalstroke-cy" format="2">
-  <advance width="623"/>
+  <advance width="620"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="564" y="0" type="line"/>
-      <point x="589" y="0" type="line"/>
-      <point x="314" y="364" type="line"/>
-      <point x="314" y="353" type="line"/>
-      <point x="574" y="694" type="line"/>
-      <point x="550" y="694" type="line"/>
-      <point x="295" y="357" type="line"/>
+      <point x="561" y="0" type="line"/>
+      <point x="586" y="0" type="line"/>
+      <point x="311" y="364" type="line"/>
+      <point x="311" y="353" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="547" y="694" type="line"/>
+      <point x="292" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="143" y="0" type="line"/>
-      <point x="143" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="140" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="132" y="348" type="line"/>
-      <point x="309" y="348" type="line"/>
-      <point x="309" y="366" type="line"/>
-      <point x="132" y="366" type="line"/>
+      <point x="129" y="348" type="line"/>
+      <point x="306" y="348" type="line"/>
+      <point x="306" y="366" type="line"/>
+      <point x="129" y="366" type="line"/>
     </contour>
     <contour>
-      <point x="236" y="178" type="line"/>
-      <point x="256" y="178" type="line"/>
-      <point x="256" y="538" type="line"/>
-      <point x="236" y="538" type="line"/>
+      <point x="233" y="178" type="line"/>
+      <point x="253" y="178" type="line"/>
+      <point x="253" y="538" type="line"/>
+      <point x="233" y="538" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
index d4e463b9..d0c4088b 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="578"/>
+  <advance width="573"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="167"/>
+    <component base="commaaccentcomb" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
index f5150d81..3e8e76fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_je-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kje-cy" format="2">
-  <advance width="627"/>
+  <advance width="624"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="264"/>
+    <component base="acutecomb.case" xOffset="261"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_.glif b/src/Cantarell-Light.ufo/glyphs/L_.glif
index efca9049..b111d69a 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="299" y="0" name="bottom"/>
-  <anchor x="175" y="367" name="center"/>
-  <anchor x="515" y="352" name="periodcentered"/>
-  <anchor x="135" y="694" name="top"/>
-  <anchor x="264" y="480" name="topright"/>
+  <anchor x="296" y="0" name="bottom"/>
+  <anchor x="172" y="367" name="center"/>
+  <anchor x="512" y="352" name="periodcentered"/>
+  <anchor x="132" y="694" name="top"/>
+  <anchor x="261" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="469" y="0" type="line"/>
-      <point x="469" y="19" type="line"/>
-      <point x="144" y="19" type="line"/>
-      <point x="144" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="466" y="0" type="line"/>
+      <point x="466" y="19" type="line"/>
+      <point x="141" y="19" type="line"/>
+      <point x="141" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_J_.glif b/src/Cantarell-Light.ufo/glyphs/L_J_.glif
index 3c65ae32..56524739 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="906"/>
+  <advance width="889"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="513"/>
+    <component base="J" xOffset="499"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_acute.glif b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
index 8a9a8a4e..3e4c26be 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="77"/>
+    <component base="acutecomb.case" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_caron.glif b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
index 2d2c3f12..5113d76b 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="152"/>
+    <component base="caroncomb.alt" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
index e04b204d..c5bbbaab 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="170"/>
+    <component base="commaaccentcomb" xOffset="167"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dot.glif b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
index 201b0414..c23fc030 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="515"/>
+    <component base="periodcentered.loclCAT.case" xOffset="512"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
index 2ddeb18e..217c210d 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="179"/>
+    <component base="dotbelowcomb" xOffset="176"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_j.glif b/src/Cantarell-Light.ufo/glyphs/L_j.glif
index a656c3fa..2cd44f9a 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="748"/>
+  <advance width="734"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="513"/>
+    <component base="j" xOffset="499"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
index b58b53f0..ad175ae7 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="49"/>
+    <component base="macronbelowcomb" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_slash.glif b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
index 194655e1..855344ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="513"/>
+  <advance width="499"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-1" yOffset="61"/>
+    <component base="slashshortcomb.case" xOffset="-4" yOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_.glif b/src/Cantarell-Light.ufo/glyphs/M_.glif
index 3b7be7e2..570ad440 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="861"/>
+  <advance width="855"/>
   <unicode hex="004D"/>
   <note>
 M
 </note>
-  <anchor x="445" y="0" name="bottom"/>
-  <anchor x="445" y="694" name="top"/>
+  <anchor x="442" y="0" name="bottom"/>
+  <anchor x="442" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="677" type="line"/>
-      <point x="137" y="677" type="line"/>
-      <point x="417" y="108" type="line"/>
-      <point x="437" y="108" type="line"/>
-      <point x="724" y="676" type="line"/>
-      <point x="717" y="676" type="line"/>
-      <point x="717" y="0" type="line"/>
-      <point x="738" y="0" type="line"/>
-      <point x="738" y="694" type="line"/>
-      <point x="712" y="694" type="line"/>
-      <point x="423" y="118" type="line"/>
-      <point x="434" y="118" type="line"/>
-      <point x="151" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="677" type="line"/>
+      <point x="134" y="677" type="line"/>
+      <point x="414" y="108" type="line"/>
+      <point x="434" y="108" type="line"/>
+      <point x="721" y="676" type="line"/>
+      <point x="714" y="676" type="line"/>
+      <point x="714" y="0" type="line"/>
+      <point x="735" y="0" type="line"/>
+      <point x="735" y="694" type="line"/>
+      <point x="709" y="694" type="line"/>
+      <point x="420" y="118" type="line"/>
+      <point x="431" y="118" type="line"/>
+      <point x="148" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
index 18ff2c83..efbc3c9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="861"/>
+  <advance width="855"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="325"/>
+    <component base="dotbelowcomb" xOffset="322"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_.glif b/src/Cantarell-Light.ufo/glyphs/N_.glif
index 7cd9cdff..e6ec88be 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="004E"/>
   <note>
 N
 </note>
-  <anchor x="390" y="0" name="bottom"/>
-  <anchor x="390" y="694" name="top"/>
+  <anchor x="387" y="0" name="bottom"/>
+  <anchor x="387" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="143" y="0" type="line"/>
-      <point x="143" y="674" type="line"/>
-      <point x="142" y="674" type="line"/>
-      <point x="608" y="0" type="line"/>
-      <point x="635" y="0" type="line"/>
-      <point x="635" y="694" type="line"/>
-      <point x="615" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="140" y="0" type="line"/>
+      <point x="140" y="674" type="line"/>
+      <point x="139" y="674" type="line"/>
+      <point x="605" y="0" type="line"/>
+      <point x="632" y="0" type="line"/>
+      <point x="632" y="694" type="line"/>
+      <point x="612" y="694" type="line"/>
+      <point x="612" y="20" type="line"/>
       <point x="615" y="20" type="line"/>
-      <point x="618" y="20" type="line"/>
-      <point x="152" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="149" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_J_.glif b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
index c837369f..0a05cb65 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1151"/>
+  <advance width="1142"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="758"/>
+    <component base="J" xOffset="752"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_acute.glif b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
index 4435b35a..af72d9ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="332"/>
+    <component base="acutecomb.case" xOffset="329"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_caron.glif b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
index c4ff1729..3ace0ea0 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="215"/>
+    <component base="caroncomb.case" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
index a5427211..b19143a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="261"/>
+    <component base="commaaccentcomb" xOffset="258"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
index c98cb20f..6892aa75 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="271"/>
+    <component base="dotaccentcomb.case" xOffset="268"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
index a35f13c9..d4c4404c 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="270"/>
+    <component base="dotbelowcomb" xOffset="267"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_j.glif b/src/Cantarell-Light.ufo/glyphs/N_j.glif
index c729744a..e3757705 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="993"/>
+  <advance width="987"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="758"/>
+    <component base="j" xOffset="752"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
index 25e404bb..515786fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_je-cy.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nje-cy" format="2">
-  <advance width="1086"/>
+  <advance width="1083"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="595" y="0" type="line"/>
-      <point x="790" y="0" type="line" smooth="yes"/>
-      <point x="933" y="0"/>
-      <point x="1018" y="73"/>
-      <point x="1018" y="200" type="curve" smooth="yes"/>
-      <point x="1018" y="322"/>
-      <point x="940" y="403"/>
-      <point x="824" y="403" type="curve" smooth="yes"/>
-      <point x="600" y="403" type="line"/>
-      <point x="600" y="386" type="line"/>
-      <point x="814" y="386" type="line" smooth="yes"/>
-      <point x="921" y="386"/>
-      <point x="996" y="312"/>
-      <point x="996" y="195" type="curve" smooth="yes"/>
-      <point x="996" y="82"/>
-      <point x="926" y="18"/>
-      <point x="801" y="18" type="curve" smooth="yes"/>
-      <point x="595" y="18" type="line"/>
+      <point x="592" y="0" type="line"/>
+      <point x="787" y="0" type="line" smooth="yes"/>
+      <point x="930" y="0"/>
+      <point x="1015" y="73"/>
+      <point x="1015" y="200" type="curve" smooth="yes"/>
+      <point x="1015" y="322"/>
+      <point x="937" y="403"/>
+      <point x="821" y="403" type="curve" smooth="yes"/>
+      <point x="597" y="403" type="line"/>
+      <point x="597" y="386" type="line"/>
+      <point x="811" y="386" type="line" smooth="yes"/>
+      <point x="918" y="386"/>
+      <point x="993" y="312"/>
+      <point x="993" y="195" type="curve" smooth="yes"/>
+      <point x="993" y="82"/>
+      <point x="923" y="18"/>
+      <point x="798" y="18" type="curve" smooth="yes"/>
+      <point x="592" y="18" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="138" y="352" type="line"/>
-      <point x="589" y="352" type="line"/>
-      <point x="589" y="371" type="line"/>
-      <point x="138" y="371" type="line"/>
+      <point x="135" y="352" type="line"/>
+      <point x="586" y="352" type="line"/>
+      <point x="586" y="371" type="line"/>
+      <point x="135" y="371" type="line"/>
     </contour>
     <contour>
-      <point x="583" y="0" type="line"/>
-      <point x="605" y="0" type="line"/>
-      <point x="605" y="694" type="line"/>
-      <point x="583" y="694" type="line"/>
+      <point x="580" y="0" type="line"/>
+      <point x="602" y="0" type="line"/>
+      <point x="602" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
index a2b3253d..2179a965 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="140"/>
+    <component base="macronbelowcomb" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
index 53355cda..3d0d30d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="758"/>
+  <advance width="752"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="146"/>
+    <component base="tildecomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
index 1be65c48..e0332f26 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="O-cy" format="2">
   <advance width="755"/>
   <unicode hex="041E"/>
-  <anchor x="377" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
index 4ed9f0e0..40ef260e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="157"/>
+    <component base="dieresiscomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hm.glif b/src/Cantarell-Light.ufo/glyphs/O_hm.glif
index d5a39abb..e3e81810 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hm.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hm.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohm" format="2">
-  <advance width="807"/>
+  <advance width="793"/>
   <unicode hex="2126"/>
   <outline>
     <contour>
-      <point x="102" y="0" type="line"/>
-      <point x="328" y="0" type="line"/>
-      <point x="328" y="13" type="line"/>
-      <point x="212" y="98"/>
-      <point x="135" y="249"/>
-      <point x="135" y="391" type="curve" smooth="yes"/>
-      <point x="135" y="567"/>
-      <point x="241" y="685"/>
-      <point x="400" y="685" type="curve" smooth="yes"/>
-      <point x="564" y="685"/>
-      <point x="674" y="567"/>
-      <point x="674" y="391" type="curve" smooth="yes"/>
-      <point x="674" y="260"/>
-      <point x="596" y="108"/>
-      <point x="479" y="13" type="curve"/>
-      <point x="479" y="0" type="line"/>
-      <point x="705" y="0" type="line"/>
-      <point x="705" y="18" type="line"/>
-      <point x="512" y="18" type="line"/>
-      <point x="622" y="115"/>
-      <point x="696" y="266"/>
-      <point x="696" y="394" type="curve" smooth="yes"/>
-      <point x="696" y="580"/>
-      <point x="579" y="704"/>
-      <point x="403" y="704" type="curve" smooth="yes"/>
-      <point x="229" y="704"/>
-      <point x="113" y="578"/>
-      <point x="113" y="388" type="curve" smooth="yes"/>
-      <point x="113" y="245"/>
-      <point x="186" y="97"/>
-      <point x="295" y="18" type="curve"/>
-      <point x="102" y="18" type="line"/>
+      <point x="95" y="0" type="line"/>
+      <point x="321" y="0" type="line"/>
+      <point x="321" y="13" type="line"/>
+      <point x="205" y="98"/>
+      <point x="128" y="249"/>
+      <point x="128" y="391" type="curve" smooth="yes"/>
+      <point x="128" y="567"/>
+      <point x="234" y="685"/>
+      <point x="393" y="685" type="curve" smooth="yes"/>
+      <point x="557" y="685"/>
+      <point x="667" y="567"/>
+      <point x="667" y="391" type="curve" smooth="yes"/>
+      <point x="667" y="260"/>
+      <point x="589" y="108"/>
+      <point x="472" y="13" type="curve"/>
+      <point x="472" y="0" type="line"/>
+      <point x="698" y="0" type="line"/>
+      <point x="698" y="18" type="line"/>
+      <point x="505" y="18" type="line"/>
+      <point x="615" y="115"/>
+      <point x="689" y="266"/>
+      <point x="689" y="394" type="curve" smooth="yes"/>
+      <point x="689" y="580"/>
+      <point x="572" y="704"/>
+      <point x="396" y="704" type="curve" smooth="yes"/>
+      <point x="222" y="704"/>
+      <point x="106" y="578"/>
+      <point x="106" y="388" type="curve" smooth="yes"/>
+      <point x="106" y="245"/>
+      <point x="179" y="97"/>
+      <point x="288" y="18" type="curve"/>
+      <point x="95" y="18" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index 2454cf44..94f2d3af 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="588"/>
+  <advance width="583"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="331" y="0" name="bottom"/>
-  <anchor x="331" y="694" name="top"/>
+  <anchor x="328" y="0" name="bottom"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="299" y="676" type="line" smooth="yes"/>
-      <point x="421" y="676"/>
-      <point x="503" y="597"/>
-      <point x="503" y="475" type="curve" smooth="yes"/>
-      <point x="503" y="358"/>
-      <point x="429" y="286"/>
-      <point x="305" y="286" type="curve" smooth="yes"/>
-      <point x="138" y="286" type="line"/>
-      <point x="138" y="268" type="line"/>
-      <point x="299" y="268" type="line" smooth="yes"/>
-      <point x="435" y="268"/>
-      <point x="525" y="353"/>
-      <point x="525" y="480" type="curve" smooth="yes"/>
-      <point x="525" y="608"/>
-      <point x="437" y="694"/>
-      <point x="305" y="694" type="curve" smooth="yes"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="676" type="line"/>
+      <point x="296" y="676" type="line" smooth="yes"/>
+      <point x="418" y="676"/>
+      <point x="500" y="597"/>
+      <point x="500" y="475" type="curve" smooth="yes"/>
+      <point x="500" y="358"/>
+      <point x="426" y="286"/>
+      <point x="302" y="286" type="curve" smooth="yes"/>
+      <point x="135" y="286" type="line"/>
+      <point x="135" y="268" type="line"/>
+      <point x="296" y="268" type="line" smooth="yes"/>
+      <point x="432" y="268"/>
+      <point x="522" y="353"/>
+      <point x="522" y="480" type="curve" smooth="yes"/>
+      <point x="522" y="608"/>
+      <point x="434" y="694"/>
+      <point x="302" y="694" type="curve" smooth="yes"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
index f4cd7fcb..e3f9cf43 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Palochka-cy" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
index 83d0c176..624000ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_e-cy.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pe-cy" format="2">
-  <advance width="697"/>
+  <advance width="691"/>
   <unicode hex="041F"/>
-  <anchor x="664" y="0" name="bottomright"/>
+  <anchor x="661" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="553" y="676" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="574" y="0" type="line"/>
-      <point x="574" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="676" type="line"/>
+      <point x="550" y="676" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
+      <point x="571" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_.glif b/src/Cantarell-Light.ufo/glyphs/Q_.glif
index cdb09143..fdf070e1 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="775"/>
+  <advance width="760"/>
   <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 89d49165..520862d2 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="775"/>
+  <advance width="760"/>
   <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 7337b7c2..81a38913 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="317" y="0" name="bottom"/>
-  <anchor x="289" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="286" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="676" type="line"/>
-      <point x="296" y="676" type="line" smooth="yes"/>
-      <point x="432" y="676"/>
-      <point x="506" y="616"/>
-      <point x="506" y="500" type="curve" smooth="yes"/>
-      <point x="506" y="389"/>
-      <point x="436" y="329"/>
-      <point x="303" y="329" type="curve" smooth="yes"/>
-      <point x="134" y="329" type="line"/>
-      <point x="134" y="311" type="line"/>
-      <point x="296" y="311" type="line" smooth="yes"/>
-      <point x="446" y="311"/>
-      <point x="528" y="381"/>
-      <point x="528" y="506" type="curve" smooth="yes"/>
-      <point x="528" y="628"/>
-      <point x="446" y="694"/>
-      <point x="301" y="694" type="curve" smooth="yes"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="676" type="line"/>
+      <point x="293" y="676" type="line" smooth="yes"/>
+      <point x="429" y="676"/>
+      <point x="503" y="616"/>
+      <point x="503" y="500" type="curve" smooth="yes"/>
+      <point x="503" y="389"/>
+      <point x="433" y="329"/>
+      <point x="300" y="329" type="curve" smooth="yes"/>
+      <point x="131" y="329" type="line"/>
+      <point x="131" y="311" type="line"/>
+      <point x="293" y="311" type="line" smooth="yes"/>
+      <point x="443" y="311"/>
+      <point x="525" y="381"/>
+      <point x="525" y="506" type="curve" smooth="yes"/>
+      <point x="525" y="628"/>
+      <point x="443" y="694"/>
+      <point x="298" y="694" type="curve" smooth="yes"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="544" y="0" type="line"/>
-      <point x="570" y="0" type="line"/>
-      <point x="385" y="325" type="line"/>
-      <point x="362" y="325" type="line"/>
+      <point x="541" y="0" type="line"/>
+      <point x="567" y="0" type="line"/>
+      <point x="382" y="325" type="line"/>
+      <point x="359" y="325" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_acute.glif b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
index 5ba13e55..91857091 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="231"/>
+    <component base="acutecomb.case" xOffset="228"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_caron.glif b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
index b9f6051d..52c8b779 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="114"/>
+    <component base="caroncomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
index c6b07adb..eb6aa02c 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="188"/>
+    <component base="commaaccentcomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
index 04cb988c..d3fb75d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="46"/>
+    <component base="dblgravecomb.case" xOffset="43"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
index 27b8678e..28376260 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="197"/>
+    <component base="dotbelowcomb" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
index 65dfc7da..e2cd5b62 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="83"/>
+    <component base="breveinvertedcomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
index b09e7e0b..c5630e80 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="628"/>
+  <advance width="620"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="67"/>
+    <component base="macronbelowcomb" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_.glif b/src/Cantarell-Light.ufo/glyphs/S_.glif
index f8638dea..dff296c4 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="586"/>
+  <advance width="559"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="286" y="0" name="bottom"/>
-  <anchor x="291" y="694" name="top"/>
+  <anchor x="273" y="0" name="bottom"/>
+  <anchor x="278" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="286" y="-10" type="curve" smooth="yes"/>
-      <point x="429" y="-10"/>
-      <point x="519" y="66"/>
-      <point x="519" y="177" type="curve" smooth="yes"/>
-      <point x="519" y="416"/>
-      <point x="100" y="307"/>
-      <point x="100" y="531" type="curve" smooth="yes"/>
-      <point x="100" y="627"/>
-      <point x="176" y="683"/>
-      <point x="306" y="683" type="curve" smooth="yes"/>
-      <point x="366" y="683"/>
-      <point x="427" y="671"/>
-      <point x="480" y="645" type="curve"/>
-      <point x="487" y="663" type="line"/>
-      <point x="434" y="691"/>
-      <point x="371" y="702"/>
-      <point x="312" y="702" type="curve" smooth="yes"/>
-      <point x="166" y="702"/>
-      <point x="78" y="636"/>
-      <point x="78" y="527" type="curve" smooth="yes"/>
-      <point x="78" y="290"/>
-      <point x="497" y="394"/>
-      <point x="497" y="172" type="curve" smooth="yes"/>
-      <point x="497" y="75"/>
-      <point x="418" y="9"/>
-      <point x="291" y="9" type="curve" smooth="yes"/>
-      <point x="224" y="9"/>
-      <point x="149" y="27"/>
-      <point x="77" y="60" type="curve"/>
-      <point x="70" y="41" type="line"/>
-      <point x="139" y="8"/>
-      <point x="217" y="-10"/>
+      <point x="273" y="-10" type="curve" smooth="yes"/>
+      <point x="416" y="-10"/>
+      <point x="506" y="66"/>
+      <point x="506" y="177" type="curve" smooth="yes"/>
+      <point x="506" y="416"/>
+      <point x="87" y="307"/>
+      <point x="87" y="531" type="curve" smooth="yes"/>
+      <point x="87" y="627"/>
+      <point x="163" y="683"/>
+      <point x="293" y="683" type="curve" smooth="yes"/>
+      <point x="353" y="683"/>
+      <point x="414" y="671"/>
+      <point x="467" y="645" type="curve"/>
+      <point x="474" y="663" type="line"/>
+      <point x="421" y="691"/>
+      <point x="358" y="702"/>
+      <point x="299" y="702" type="curve" smooth="yes"/>
+      <point x="153" y="702"/>
+      <point x="65" y="636"/>
+      <point x="65" y="527" type="curve" smooth="yes"/>
+      <point x="65" y="290"/>
+      <point x="484" y="394"/>
+      <point x="484" y="172" type="curve" smooth="yes"/>
+      <point x="484" y="75"/>
+      <point x="405" y="9"/>
+      <point x="278" y="9" type="curve" smooth="yes"/>
+      <point x="211" y="9"/>
+      <point x="136" y="27"/>
+      <point x="64" y="60" type="curve"/>
+      <point x="57" y="41" type="line"/>
+      <point x="126" y="8"/>
+      <point x="204" 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 4d2869bb..4b4919c3 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="586"/>
+  <advance width="559"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="233"/>
+    <component base="acutecomb.case" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
index 3decf925..264a066b 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="586"/>
+  <advance width="559"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="233"/>
-    <component base="dotaccentcomb.case" xOffset="167" yOffset="70"/>
+    <component base="acutecomb.case" xOffset="220"/>
+    <component base="dotaccentcomb.case" xOffset="154" yOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
index 634ff15b..21c29e8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_altillo.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="271"/>
+  <advance width="265"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="14" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="11" yOffset="-808"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_caron.glif b/src/Cantarell-Light.ufo/glyphs/S_caron.glif
index b7c678cc..3fb830c1 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="586"/>
+  <advance width="559"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="116"/>
+    <component base="caroncomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
index 3190a27a..e352ae8b 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="586"/>
+  <advance width="559"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="116"/>
-    <component base="dotaccentcomb.case" xOffset="172" yOffset="109"/>
+    <component base="caroncomb.case" xOffset="103"/>
+    <component base="dotaccentcomb.case" xOffset="159" 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 d36b1204..d593a1f9 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="586"/>
+  <advance width="559"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="161"/>
+    <component base="cedillacomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
index cd4a831c..86f83e1e 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="586"/>
+  <advance width="559"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="114"/>
+    <component base="circumflexcomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
index 437890f8..ec5cecc1 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="586"/>
+  <advance width="559"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="157"/>
+    <component base="commaaccentcomb" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
index 21bb426d..22d8016f 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="586"/>
+  <advance width="559"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="172"/>
+    <component base="dotaccentcomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
index 199746ac..8ea63d76 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="586"/>
+  <advance width="559"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotbelowcomb" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
index a2c6ef19..f8f5e091 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="586"/>
+  <advance width="559"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="166"/>
-    <component base="dotaccentcomb.case" xOffset="172"/>
+    <component base="dotbelowcomb" xOffset="153"/>
+    <component base="dotaccentcomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
index ea18c534..29165bad 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_ha-cy.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sha-cy" format="2">
-  <advance width="980"/>
+  <advance width="974"/>
   <unicode hex="0428"/>
-  <anchor x="877" y="0" name="bottomright"/>
+  <anchor x="874" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="857" y="0" type="line"/>
-      <point x="857" y="694" type="line"/>
-      <point x="835" y="694" type="line"/>
-      <point x="835" y="19" type="line"/>
-      <point x="145" y="19" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="854" y="0" type="line"/>
+      <point x="854" y="694" type="line"/>
+      <point x="832" y="694" type="line"/>
+      <point x="832" y="19" type="line"/>
+      <point x="142" y="19" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="487" y="10" type="line"/>
-      <point x="509" y="10" type="line"/>
-      <point x="509" y="694" type="line"/>
-      <point x="487" y="694" type="line"/>
+      <point x="484" y="10" type="line"/>
+      <point x="506" y="10" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="484" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
index 3e0d272b..5801438a 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hcha-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shcha-cy" format="2">
-  <advance width="986"/>
+  <advance width="980"/>
   <unicode hex="0429"/>
   <outline>
     <component base="Sha-cy"/>
-    <component base="descender-cy.case" xOffset="781"/>
+    <component base="descender-cy.case" xOffset="778"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
index ea2f83f1..eaa5ff5e 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_hha-cy.glif
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Shha-cy" format="2">
-  <advance width="640"/>
+  <advance width="635"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
-      <point x="539" y="0" type="line"/>
-      <point x="560" y="0" type="line"/>
-      <point x="560" y="239" type="line" smooth="yes"/>
-      <point x="560" y="346"/>
-      <point x="487" y="411"/>
-      <point x="353" y="411" type="curve" smooth="yes"/>
-      <point x="266" y="411"/>
-      <point x="177" y="384"/>
-      <point x="123" y="345" type="curve"/>
-      <point x="133" y="334" type="line"/>
-      <point x="181" y="367"/>
-      <point x="269" y="393"/>
-      <point x="350" y="393" type="curve" smooth="yes"/>
-      <point x="471" y="393"/>
-      <point x="539" y="336"/>
-      <point x="539" y="239" type="curve" smooth="yes"/>
+      <point x="536" y="0" type="line"/>
+      <point x="557" y="0" type="line"/>
+      <point x="557" y="239" type="line" smooth="yes"/>
+      <point x="557" y="346"/>
+      <point x="484" y="411"/>
+      <point x="350" y="411" type="curve" smooth="yes"/>
+      <point x="263" y="411"/>
+      <point x="174" y="384"/>
+      <point x="120" y="345" type="curve"/>
+      <point x="130" y="334" type="line"/>
+      <point x="178" y="367"/>
+      <point x="266" y="393"/>
+      <point x="347" y="393" type="curve" smooth="yes"/>
+      <point x="468" y="393"/>
+      <point x="536" y="336"/>
+      <point x="536" y="239" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="124" y="0" type="line"/>
-      <point x="145" y="0" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="124" y="694" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="142" y="0" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="121" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
index 3bebc601..87efeea1 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_oftsign-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Softsign-cy" format="2">
-  <advance width="618"/>
+  <advance width="615"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="325" y="0" type="line" smooth="yes"/>
-      <point x="466" y="0"/>
-      <point x="550" y="74"/>
-      <point x="550" y="200" type="curve" smooth="yes"/>
-      <point x="550" y="322"/>
-      <point x="473" y="403"/>
-      <point x="358" y="403" type="curve" smooth="yes"/>
-      <point x="137" y="403" type="line"/>
-      <point x="137" y="386" type="line"/>
-      <point x="348" y="386" type="line" smooth="yes"/>
-      <point x="456" y="386"/>
-      <point x="528" y="310"/>
-      <point x="528" y="195" type="curve" smooth="yes"/>
-      <point x="528" y="84"/>
-      <point x="457" y="18"/>
-      <point x="336" y="18" type="curve" smooth="yes"/>
-      <point x="145" y="18" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="322" y="0" type="line" smooth="yes"/>
+      <point x="463" y="0"/>
+      <point x="547" y="74"/>
+      <point x="547" y="200" type="curve" smooth="yes"/>
+      <point x="547" y="322"/>
+      <point x="470" y="403"/>
+      <point x="355" y="403" type="curve" smooth="yes"/>
+      <point x="134" y="403" type="line"/>
+      <point x="134" y="386" type="line"/>
+      <point x="345" y="386" type="line" smooth="yes"/>
+      <point x="453" y="386"/>
+      <point x="525" y="310"/>
+      <point x="525" y="195" type="curve" smooth="yes"/>
+      <point x="525" y="84"/>
+      <point x="454" y="18"/>
+      <point x="333" y="18" type="curve" smooth="yes"/>
+      <point x="142" y="18" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_.glif b/src/Cantarell-Light.ufo/glyphs/T_.glif
index 6568cf50..cd98c479 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="541"/>
+  <advance width="535"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="268" y="0" name="bottom"/>
-  <anchor x="271" y="357" name="center"/>
-  <anchor x="271" y="694" name="top"/>
+  <anchor x="265" y="0" name="bottom"/>
+  <anchor x="268" y="357" name="center"/>
+  <anchor x="268" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="260" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="281" y="676" type="line"/>
-      <point x="526" y="676" type="line"/>
-      <point x="526" y="694" type="line"/>
-      <point x="15" y="694" type="line"/>
-      <point x="15" y="676" type="line"/>
-      <point x="260" y="676" type="line"/>
+      <point x="257" y="0" type="line"/>
+      <point x="278" y="0" type="line"/>
+      <point x="278" y="676" type="line"/>
+      <point x="523" y="676" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="12" y="694" type="line"/>
+      <point x="12" y="676" type="line"/>
+      <point x="257" y="676" 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 ae3c067c..1c2a327a 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="541"/>
+  <advance width="535"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="30" yOffset="58"/>
+    <component base="strokeshortcomb.case" xOffset="27" 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 76fba43b..b09f9142 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="541"/>
+  <advance width="535"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="96"/>
+    <component base="caroncomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/T_cedilla.glif
index 537233ef..d63d9fae 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="541"/>
+  <advance width="535"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="143"/>
+    <component base="cedillacomb" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/T_commaaccent.glif
index 2a2b11c4..c67199e9 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="541"/>
+  <advance width="535"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="139"/>
+    <component base="commaaccentcomb" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/T_dotbelow.glif
index f73b7e68..4252aaac 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="541"/>
+  <advance width="535"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="148"/>
+    <component base="dotbelowcomb" xOffset="145"/>
   </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 6a82cd65..aa57abf5 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
@@ -1,8 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="541"/>
+  <advance width="535"/>
   <unicode hex="0422"/>
-  <anchor x="569" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_horn.glif b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
index 0c0c3e68..8b39bbd7 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="588"/>
+  <advance width="583"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="138" y="148" type="line"/>
-      <point x="299" y="148" type="line" smooth="yes"/>
-      <point x="441" y="148"/>
-      <point x="525" y="228"/>
-      <point x="525" y="357" type="curve" smooth="yes"/>
-      <point x="525" y="489"/>
-      <point x="437" y="574"/>
-      <point x="305" y="574" type="curve" smooth="yes"/>
-      <point x="138" y="574" type="line"/>
-      <point x="138" y="556" type="line"/>
-      <point x="299" y="556" type="line" smooth="yes"/>
-      <point x="421" y="556"/>
-      <point x="503" y="477"/>
-      <point x="503" y="355" type="curve" smooth="yes"/>
-      <point x="503" y="238"/>
-      <point x="429" y="166"/>
-      <point x="305" y="166" type="curve" smooth="yes"/>
-      <point x="138" y="166" type="line"/>
+      <point x="135" y="148" type="line"/>
+      <point x="296" y="148" type="line" smooth="yes"/>
+      <point x="438" y="148"/>
+      <point x="522" y="228"/>
+      <point x="522" y="357" type="curve" smooth="yes"/>
+      <point x="522" y="489"/>
+      <point x="434" y="574"/>
+      <point x="302" y="574" type="curve" smooth="yes"/>
+      <point x="135" y="574" type="line"/>
+      <point x="135" y="556" type="line"/>
+      <point x="296" y="556" type="line" smooth="yes"/>
+      <point x="418" y="556"/>
+      <point x="500" y="477"/>
+      <point x="500" y="355" type="curve" smooth="yes"/>
+      <point x="500" y="238"/>
+      <point x="426" y="166"/>
+      <point x="302" y="166" type="curve" smooth="yes"/>
+      <point x="135" y="166" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="144" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="141" y="0" type="line"/>
+      <point x="141" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/T_linebelow.glif
index 5a7c6eab..52d85145 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="541"/>
+  <advance width="535"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="18"/>
+    <component base="macronbelowcomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
index 2a5b9a6c..d5e10da0 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_se-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tse-cy" format="2">
-  <advance width="702"/>
+  <advance width="696"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="628" y="-175" type="line"/>
-      <point x="649" y="-175" type="line"/>
-      <point x="649" y="19" type="line"/>
-      <point x="145" y="19" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
-      <point x="123" y="0" type="line"/>
-      <point x="628" y="0" type="line"/>
+      <point x="625" y="-175" type="line"/>
+      <point x="646" y="-175" type="line"/>
+      <point x="646" y="19" type="line"/>
+      <point x="142" y="19" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="625" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="552" y="10" type="line"/>
-      <point x="573" y="10" type="line"/>
-      <point x="573" y="694" type="line"/>
-      <point x="552" y="694" type="line"/>
+      <point x="549" y="10" type="line"/>
+      <point x="570" y="10" type="line"/>
+      <point x="570" y="694" type="line"/>
+      <point x="549" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
index 63b36c85..59f073cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_she-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tshe-cy" format="2">
-  <advance width="784"/>
+  <advance width="782"/>
   <unicode hex="040B"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
index 6719f492..93414033 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_-cy.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U-cy" format="2">
-  <advance width="578"/>
+  <advance width="536"/>
   <unicode hex="0423"/>
-  <anchor x="288" y="694" name="top"/>
+  <anchor x="266" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="159" y="0" type="line"/>
-      <point x="182" y="0" type="line"/>
-      <point x="552" y="694" type="line"/>
-      <point x="528" y="694" type="line"/>
-      <point x="304" y="263" type="line"/>
-      <point x="297" y="253" type="line"/>
+      <point x="137" y="0" type="line"/>
+      <point x="161" y="0" type="line"/>
+      <point x="531" y="694" type="line"/>
+      <point x="506" y="694" type="line"/>
+      <point x="282" y="263" type="line"/>
+      <point x="275" y="253" type="line"/>
     </contour>
     <contour>
-      <point x="297" y="245" type="line"/>
-      <point x="308" y="263" type="line"/>
-      <point x="49" y="694" type="line"/>
-      <point x="24" y="694" type="line"/>
+      <point x="275" y="245" type="line"/>
+      <point x="286" y="263" type="line"/>
+      <point x="27" y="694" type="line"/>
+      <point x="2" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_.glif b/src/Cantarell-Light.ufo/glyphs/U_.glif
index ff26b39b..b70c8759 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="687"/>
+  <advance width="683"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="345" y="0" name="bottom"/>
-  <anchor x="427" y="10" name="ogonek"/>
-  <anchor x="345" y="694" name="top"/>
-  <anchor x="642" y="694" name="topright"/>
+  <anchor x="343" y="0" name="bottom"/>
+  <anchor x="425" y="10" name="ogonek"/>
+  <anchor x="343" y="694" name="top"/>
+  <anchor x="640" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="344" y="-10" type="curve" smooth="yes"/>
-      <point x="493" y="-10"/>
-      <point x="581" y="85"/>
-      <point x="581" y="246" type="curve" smooth="yes"/>
-      <point x="581" y="694" type="line"/>
-      <point x="560" y="694" type="line"/>
-      <point x="560" y="246" type="line" smooth="yes"/>
-      <point x="560" y="97"/>
-      <point x="481" y="9"/>
-      <point x="347" y="9" type="curve" smooth="yes"/>
-      <point x="209" y="9"/>
-      <point x="128" y="97"/>
-      <point x="128" y="246" type="curve" smooth="yes"/>
-      <point x="128" y="694" type="line"/>
-      <point x="106" y="694" type="line"/>
-      <point x="106" y="246" type="line" smooth="yes"/>
-      <point x="106" y="85"/>
-      <point x="194" y="-10"/>
+      <point x="342" y="-10" type="curve" smooth="yes"/>
+      <point x="491" y="-10"/>
+      <point x="579" y="85"/>
+      <point x="579" y="246" type="curve" smooth="yes"/>
+      <point x="579" y="694" type="line"/>
+      <point x="558" y="694" type="line"/>
+      <point x="558" y="246" type="line" smooth="yes"/>
+      <point x="558" y="97"/>
+      <point x="479" y="9"/>
+      <point x="345" y="9" type="curve" smooth="yes"/>
+      <point x="207" y="9"/>
+      <point x="126" y="97"/>
+      <point x="126" y="246" type="curve" smooth="yes"/>
+      <point x="126" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+      <point x="104" y="246" type="line" smooth="yes"/>
+      <point x="104" y="85"/>
+      <point x="192" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_acute.glif b/src/Cantarell-Light.ufo/glyphs/U_acute.glif
index 42254dc5..9b67f1f1 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="687"/>
+  <advance width="683"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="287"/>
+    <component base="acutecomb.case" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_breve.glif b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
index f77f0cff..31469b42 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="687"/>
+  <advance width="683"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="142"/>
+    <component base="brevecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_caron.glif b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
index ae89d9e6..3eeae61a 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="687"/>
+  <advance width="683"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="170"/>
+    <component base="caroncomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
index 3714bb73..4e83f037 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="687"/>
+  <advance width="683"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="168"/>
+    <component base="circumflexcomb.case" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
index 674e3e73..a64f7e83 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="687"/>
+  <advance width="683"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="102"/>
+    <component base="dblgravecomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
index ec63e88d..1ae57736 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis-cy" format="2">
-  <advance width="578"/>
+  <advance width="536"/>
   <unicode hex="04F0"/>
   <outline>
     <component base="U-cy"/>
-    <component base="dieresiscomb.case" xOffset="68"/>
+    <component base="dieresiscomb.case" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
index f50bfe6f..01209134 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="687"/>
+  <advance width="683"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="125"/>
+    <component base="dieresiscomb.case" xOffset="123"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
index b5a05d36..cdf5e227 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="687"/>
+  <advance width="683"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="125"/>
-    <component base="acutecomb.case" xOffset="287" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="123"/>
+    <component base="acutecomb.case" xOffset="285" 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 573c4bc3..becd5792 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="687"/>
+  <advance width="683"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="125"/>
-    <component base="caroncomb.case" xOffset="170" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="123"/>
+    <component base="caroncomb.case" xOffset="168" 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 13bf6a67..ad5b5d1b 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="687"/>
+  <advance width="683"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="125"/>
-    <component base="gravecomb.case" xOffset="148" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="123"/>
+    <component base="gravecomb.case" xOffset="146" 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 e9814950..8c47dc1c 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="687"/>
+  <advance width="683"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="125"/>
-    <component base="macroncomb.case" xOffset="107" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="123"/>
+    <component base="macroncomb.case" xOffset="105" 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 7ebd1353..4df00e66 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="687"/>
+  <advance width="683"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="225"/>
+    <component base="dotbelowcomb" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_grave.glif b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
index 115f86bb..7f7ede7e 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="687"/>
+  <advance width="683"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="148"/>
+    <component base="gravecomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
index a2ef32a3..74d953f6 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="687"/>
+  <advance width="683"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="190"/>
+    <component base="hookabovecomb.case" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horn.glif b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
index 7dab564c..84767290 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="759"/>
+  <advance width="755"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="510" yOffset="212"/>
+    <component base="horncomb" xOffset="508" 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 7428e710..ad8e373e 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="759"/>
+  <advance width="755"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="287"/>
+    <component base="acutecomb.case" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
index 662c77e3..865421cc 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="759"/>
+  <advance width="755"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="225"/>
+    <component base="dotbelowcomb" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
index df36cc87..76cf62e8 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="759"/>
+  <advance width="755"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="148"/>
+    <component base="gravecomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
index 498a1348..a50b2ed0 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="759"/>
+  <advance width="755"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="190"/>
+    <component base="hookabovecomb.case" xOffset="188"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
index 6a875c9d..f23ce3fa 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="759"/>
+  <advance width="755"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="101"/>
+    <component base="tildecomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
index 22bb9586..2f49e842 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut-cy" format="2">
-  <advance width="578"/>
+  <advance width="536"/>
   <unicode hex="04F2"/>
   <outline>
     <component base="U-cy"/>
-    <component base="hungarumlautcomb.case" xOffset="116"/>
+    <component base="hungarumlautcomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
index 4a4e71b3..07e82c70 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="687"/>
+  <advance width="683"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="173"/>
+    <component base="hungarumlautcomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
index 2b2c7124..979895ac 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="687"/>
+  <advance width="683"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="139"/>
+    <component base="breveinvertedcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
index 7f973c43..61439eb3 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_macron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron-cy" format="2">
-  <advance width="578"/>
+  <advance width="536"/>
   <unicode hex="04EE"/>
   <outline>
     <component base="U-cy"/>
-    <component base="macroncomb.case" xOffset="50"/>
+    <component base="macroncomb.case" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron.glif b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
index e47f945f..5ffd7f49 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="687"/>
+  <advance width="683"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="107"/>
+    <component base="macroncomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
index fcbd8818..41fcae5e 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="687"/>
+  <advance width="683"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="107"/>
-    <component base="dieresiscomb.case" xOffset="125" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="105"/>
+    <component base="dieresiscomb.case" xOffset="123" 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 a9eb9b00..c24b5046 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="687"/>
+  <advance width="683"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="26"/>
+    <component base="ogonekcomb.tall.case" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ring.glif b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
index ec6b2d44..255b28db 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="687"/>
+  <advance width="683"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="171"/>
+    <component base="ringcomb.case" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
index 5b458566..3b990828 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_short-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ushort-cy" format="2">
-  <advance width="578"/>
+  <advance width="536"/>
   <unicode hex="040E"/>
   <outline>
     <component base="U-cy"/>
-    <component base="brevecomb-cy.case" xOffset="95"/>
+    <component base="brevecomb-cy.case" xOffset="73"/>
   </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 2f57b177..43ae99c8 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="544"/>
+  <advance width="540"/>
   <unicode hex="04AE"/>
   <anchor x="273" 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 1152b7b1..82191949 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="544"/>
+  <advance width="540"/>
   <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 873049bb..b8868def 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="687"/>
+  <advance width="683"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="101"/>
+    <component base="tildecomb.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
index f4beed6b..0439c840 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="687"/>
+  <advance width="683"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="101"/>
-    <component base="acutecomb.case" xOffset="287" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="99"/>
+    <component base="acutecomb.case" xOffset="285" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
index d0f962d1..bbf833be 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="641"/>
+  <advance width="635"/>
   <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 8a4653e3..58096fda 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="965"/>
+  <advance width="961"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="482" y="0" name="bottom"/>
-  <anchor x="482" y="694" name="top"/>
+  <anchor x="480" y="0" name="bottom"/>
+  <anchor x="480" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="242" y="0" type="line"/>
-      <point x="254" y="0" type="line"/>
-      <point x="490" y="666" type="line"/>
-      <point x="476" y="666" type="line"/>
-      <point x="714" y="0" type="line"/>
-      <point x="727" y="0" type="line"/>
-      <point x="934" y="694" type="line"/>
-      <point x="913" y="694" type="line"/>
-      <point x="717" y="32" type="line"/>
-      <point x="725" y="32" type="line"/>
-      <point x="490" y="688" type="line"/>
-      <point x="477" y="688" type="line"/>
-      <point x="245" y="32" type="line"/>
-      <point x="253" y="32" type="line"/>
-      <point x="54" y="694" type="line"/>
-      <point x="31" y="694" type="line"/>
+      <point x="240" y="0" type="line"/>
+      <point x="252" y="0" type="line"/>
+      <point x="488" y="666" type="line"/>
+      <point x="474" y="666" type="line"/>
+      <point x="712" y="0" type="line"/>
+      <point x="725" y="0" type="line"/>
+      <point x="932" y="694" type="line"/>
+      <point x="911" y="694" type="line"/>
+      <point x="715" y="32" type="line"/>
+      <point x="723" y="32" type="line"/>
+      <point x="488" y="688" type="line"/>
+      <point x="475" y="688" type="line"/>
+      <point x="243" y="32" type="line"/>
+      <point x="251" y="32" type="line"/>
+      <point x="52" y="694" type="line"/>
+      <point x="29" 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 5a85fbc3..465f4261 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="965"/>
+  <advance width="961"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="424"/>
+    <component base="acutecomb.case" xOffset="422"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
index 1aaec7f1..04e26065 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="965"/>
+  <advance width="961"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="305"/>
+    <component base="circumflexcomb.case" xOffset="303"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
index 26dfde49..d0f694fd 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="965"/>
+  <advance width="961"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="262"/>
+    <component base="dieresiscomb.case" xOffset="260"/>
   </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 4a4e919b..4d9b1823 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="965"/>
+  <advance width="961"/>
   <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 76ba64df..f94c88c1 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="965"/>
+  <advance width="961"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="285"/>
+    <component base="gravecomb.case" xOffset="283"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_.glif b/src/Cantarell-Light.ufo/glyphs/X_.glif
index dbbfc20a..5a090c81 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="598"/>
+  <advance width="590"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="302" y="0" name="bottom"/>
-  <anchor x="302" y="694" name="top"/>
+  <anchor x="298" y="0" name="bottom"/>
+  <anchor x="298" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="536" y="0" type="line"/>
-      <point x="563" y="0" type="line"/>
-      <point x="293" y="385" type="line"/>
-      <point x="91" y="694" type="line"/>
-      <point x="64" y="694" type="line"/>
-      <point x="280" y="369" type="line"/>
+      <point x="532" y="0" type="line"/>
+      <point x="559" y="0" type="line"/>
+      <point x="289" y="385" type="line"/>
+      <point x="87" y="694" type="line"/>
+      <point x="60" y="694" type="line"/>
+      <point x="276" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="35" y="0" type="line"/>
-      <point x="59" y="0" type="line"/>
-      <point x="298" y="351" type="line"/>
-      <point x="287" y="367" type="line"/>
+      <point x="31" y="0" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="294" y="351" type="line"/>
+      <point x="283" y="367" type="line"/>
     </contour>
     <contour>
-      <point x="306" y="358" type="line"/>
-      <point x="543" y="694" type="line"/>
-      <point x="519" y="694" type="line"/>
-      <point x="295" y="375" type="line"/>
+      <point x="302" y="358" type="line"/>
+      <point x="539" y="694" type="line"/>
+      <point x="515" y="694" type="line"/>
+      <point x="291" 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 0c2d00db..66beb2ac 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="544"/>
+  <advance width="540"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="277" y="0" name="bottom"/>
-  <anchor x="277" y="694" name="top"/>
-  <anchor x="5" y="694" name="topleft"/>
+  <anchor x="275" y="0" name="bottom"/>
+  <anchor x="275" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="262" y="0" type="line"/>
-      <point x="283" y="0" type="line"/>
-      <point x="283" y="333" type="line"/>
-      <point x="520" y="694" type="line"/>
-      <point x="497" y="694" type="line"/>
-      <point x="270" y="344" type="line"/>
-      <point x="278" y="344" type="line"/>
-      <point x="50" y="694" type="line"/>
-      <point x="24" y="694" type="line"/>
-      <point x="262" y="333" type="line"/>
+      <point x="260" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="333" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="495" y="694" type="line"/>
+      <point x="268" y="344" type="line"/>
+      <point x="276" y="344" type="line"/>
+      <point x="48" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
+      <point x="260" 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 3cec61dd..f5846d29 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="544"/>
+  <advance width="540"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="219"/>
+    <component base="acutecomb.case" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
index 4ca95737..aa7c56fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_at-cy.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yat-cy" format="2">
-  <advance width="720"/>
+  <advance width="717"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="211" y="0" type="line"/>
-      <point x="424" y="0" type="line" smooth="yes"/>
-      <point x="567" y="0"/>
-      <point x="652" y="74"/>
-      <point x="652" y="200" type="curve" smooth="yes"/>
-      <point x="652" y="322"/>
-      <point x="574" y="403"/>
-      <point x="458" y="403" type="curve" smooth="yes"/>
-      <point x="224" y="403" type="line"/>
-      <point x="224" y="386" type="line"/>
-      <point x="448" y="386" type="line" smooth="yes"/>
-      <point x="555" y="386"/>
-      <point x="630" y="312"/>
-      <point x="630" y="195" type="curve" smooth="yes"/>
-      <point x="630" y="82"/>
-      <point x="560" y="18"/>
-      <point x="435" y="18" type="curve" smooth="yes"/>
-      <point x="232" y="18" type="line"/>
-      <point x="232" y="694" type="line"/>
-      <point x="211" y="694" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="421" y="0" type="line" smooth="yes"/>
+      <point x="564" y="0"/>
+      <point x="649" y="74"/>
+      <point x="649" y="200" type="curve" smooth="yes"/>
+      <point x="649" y="322"/>
+      <point x="571" y="403"/>
+      <point x="455" y="403" type="curve" smooth="yes"/>
+      <point x="221" y="403" type="line"/>
+      <point x="221" y="386" type="line"/>
+      <point x="445" y="386" type="line" smooth="yes"/>
+      <point x="552" y="386"/>
+      <point x="627" y="312"/>
+      <point x="627" y="195" type="curve" smooth="yes"/>
+      <point x="627" y="82"/>
+      <point x="557" y="18"/>
+      <point x="432" y="18" type="curve" smooth="yes"/>
+      <point x="229" y="18" type="line"/>
+      <point x="229" y="694" type="line"/>
+      <point x="208" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="66" y="545" type="line"/>
-      <point x="426" y="545" type="line"/>
-      <point x="426" y="564" type="line"/>
-      <point x="66" y="564" type="line"/>
+      <point x="63" y="545" type="line"/>
+      <point x="423" y="545" type="line"/>
+      <point x="423" y="564" type="line"/>
+      <point x="63" y="564" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
index d328cd65..db5466c9 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="544"/>
+  <advance width="540"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="100"/>
+    <component base="circumflexcomb.case" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
index 126b88d6..ff4fbf0d 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="544"/>
+  <advance width="540"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="57"/>
+    <component base="dieresiscomb.case" xOffset="55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
index d7bf205e..f3e88b1a 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="544"/>
+  <advance width="540"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="158"/>
+    <component base="dotaccentcomb.case" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
index 3dc29df4..0c6f3119 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="544"/>
+  <advance width="540"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="157"/>
+    <component base="dotbelowcomb" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
index f75e95b5..d9e4b564 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_eru-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yeru-cy" format="2">
-  <advance width="813"/>
+  <advance width="807"/>
   <unicode hex="042B"/>
-  <anchor x="412" y="694" name="top"/>
+  <anchor x="409" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="307" y="0" type="line" smooth="yes"/>
-      <point x="450" y="0"/>
-      <point x="535" y="74"/>
-      <point x="535" y="200" type="curve" smooth="yes"/>
-      <point x="535" y="322"/>
-      <point x="457" y="403"/>
-      <point x="341" y="403" type="curve" smooth="yes"/>
-      <point x="137" y="403" type="line"/>
-      <point x="137" y="386" type="line"/>
-      <point x="331" y="386" type="line" smooth="yes"/>
-      <point x="440" y="386"/>
-      <point x="513" y="310"/>
-      <point x="513" y="195" type="curve" smooth="yes"/>
-      <point x="513" y="84"/>
-      <point x="441" y="18"/>
-      <point x="318" y="18" type="curve" smooth="yes"/>
-      <point x="145" y="18" type="line"/>
-      <point x="145" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="304" y="0" type="line" smooth="yes"/>
+      <point x="447" y="0"/>
+      <point x="532" y="74"/>
+      <point x="532" y="200" type="curve" smooth="yes"/>
+      <point x="532" y="322"/>
+      <point x="454" y="403"/>
+      <point x="338" y="403" type="curve" smooth="yes"/>
+      <point x="134" y="403" type="line"/>
+      <point x="134" y="386" type="line"/>
+      <point x="328" y="386" type="line" smooth="yes"/>
+      <point x="437" y="386"/>
+      <point x="510" y="310"/>
+      <point x="510" y="195" type="curve" smooth="yes"/>
+      <point x="510" y="84"/>
+      <point x="438" y="18"/>
+      <point x="315" y="18" type="curve" smooth="yes"/>
+      <point x="142" y="18" type="line"/>
+      <point x="142" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="669" y="0" type="line"/>
-      <point x="690" y="0" type="line"/>
-      <point x="690" y="694" type="line"/>
-      <point x="669" y="694" type="line"/>
+      <point x="666" y="0" type="line"/>
+      <point x="687" y="0" type="line"/>
+      <point x="687" y="694" type="line"/>
+      <point x="666" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
index 1b8e4204..2a67559d 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_erudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yerudieresis-cy" format="2">
-  <advance width="813"/>
+  <advance width="807"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="192"/>
+    <component base="dieresiscomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
index 4e4c25fc..bdea4dc9 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="544"/>
+  <advance width="540"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="80"/>
+    <component base="gravecomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
index 5d89918d..d8e9fc48 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="544"/>
+  <advance width="540"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="122"/>
+    <component base="hookabovecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
index 203f017b..17c6ebe1 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yi-cy" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-86"/>
+    <component base="dieresiscomb.case" xOffset="-89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
index 571b9dc4..6394a5e4 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="544"/>
+  <advance width="540"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="39"/>
+    <component base="macroncomb.case" xOffset="37"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
index 5adb8dbd..a57b05f3 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="544"/>
+  <advance width="540"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="33"/>
+    <component base="tildecomb.case" xOffset="31"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
index c1210181..11674c51 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yusbig-cy" format="2">
-  <advance width="770"/>
+  <advance width="766"/>
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="66" y="0" type="curve"/>
-      <point x="85" y="0" type="line"/>
-      <point x="85" y="250"/>
-      <point x="178" y="364"/>
-      <point x="381" y="364" type="curve" smooth="yes"/>
-      <point x="589" y="364"/>
-      <point x="685" y="250"/>
-      <point x="685" y="0" type="curve"/>
-      <point x="704" y="0" type="line"/>
-      <point x="704" y="262"/>
-      <point x="605" y="382"/>
-      <point x="388" y="382" type="curve" smooth="yes"/>
-      <point x="167" y="382"/>
-      <point x="66" y="262"/>
+      <point x="64" y="0" type="curve"/>
+      <point x="83" y="0" type="line"/>
+      <point x="83" y="250"/>
+      <point x="176" y="364"/>
+      <point x="379" y="364" type="curve" smooth="yes"/>
+      <point x="587" y="364"/>
+      <point x="683" y="250"/>
+      <point x="683" y="0" type="curve"/>
+      <point x="702" y="0" type="line"/>
+      <point x="702" y="262"/>
+      <point x="603" y="382"/>
+      <point x="386" y="382" type="curve" smooth="yes"/>
+      <point x="165" y="382"/>
+      <point x="64" y="262"/>
     </contour>
     <contour>
-      <point x="374" y="0" type="line"/>
-      <point x="394" y="0" type="line"/>
-      <point x="394" y="369" type="line"/>
-      <point x="374" y="369" type="line"/>
+      <point x="372" y="0" type="line"/>
+      <point x="392" y="0" type="line"/>
+      <point x="392" y="369" type="line"/>
+      <point x="372" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="363" y="381" type="line"/>
-      <point x="383" y="381" type="line"/>
-      <point x="132" y="683" type="line"/>
-      <point x="130" y="677" type="line"/>
-      <point x="639" y="677" type="line"/>
-      <point x="637" y="683" type="line"/>
+      <point x="361" y="381" type="line"/>
       <point x="381" y="381" type="line"/>
-      <point x="401" y="381" type="line"/>
-      <point x="657" y="676" type="line"/>
-      <point x="657" y="694" type="line"/>
-      <point x="112" y="694" type="line"/>
-      <point x="112" y="676" type="line"/>
+      <point x="130" y="683" type="line"/>
+      <point x="128" y="677" type="line"/>
+      <point x="637" y="677" type="line"/>
+      <point x="635" y="683" type="line"/>
+      <point x="379" y="381" type="line"/>
+      <point x="399" y="381" type="line"/>
+      <point x="655" y="676" type="line"/>
+      <point x="655" y="694" type="line"/>
+      <point x="110" y="694" type="line"/>
+      <point x="110" y="676" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_.glif b/src/Cantarell-Light.ufo/glyphs/Z_.glif
index 3a280b20..7ff5fc8e 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="628"/>
+  <advance width="624"/>
   <unicode hex="005A"/>
   <note>
 Z
 </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="50" y="0" type="line"/>
-      <point x="578" y="0" type="line"/>
-      <point x="578" y="18" type="line"/>
-      <point x="72" y="18" type="line"/>
-      <point x="72" y="12" type="line"/>
-      <point x="561" y="677" type="line"/>
-      <point x="561" y="694" type="line"/>
-      <point x="68" y="694" type="line"/>
-      <point x="68" y="676" type="line"/>
-      <point x="539" y="676" type="line"/>
-      <point x="539" y="682" type="line"/>
-      <point x="50" y="16" type="line"/>
+      <point x="48" y="0" type="line"/>
+      <point x="576" y="0" type="line"/>
+      <point x="576" y="18" type="line"/>
+      <point x="70" y="18" type="line"/>
+      <point x="70" y="12" type="line"/>
+      <point x="559" y="677" type="line"/>
+      <point x="559" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
+      <point x="66" y="676" type="line"/>
+      <point x="537" y="676" type="line"/>
+      <point x="537" y="682" type="line"/>
+      <point x="48" 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 5d5b9276..f30c1f82 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="628"/>
+  <advance width="624"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="246"/>
+    <component base="acutecomb.case" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/Z_caron.glif
index eaa4d1bc..c3b61d96 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="628"/>
+  <advance width="624"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="129"/>
+    <component base="caroncomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif
index f013092e..8c6054fb 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="628"/>
+  <advance width="624"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="185"/>
+    <component base="dotaccentcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif
index 6eb2d8ea..bc1e0829 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="628"/>
+  <advance width="624"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="184"/>
+    <component base="dotbelowcomb" xOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
index 40cce2a6..c94d6a4c 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_e-cy.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ze-cy" format="2">
-  <advance width="588"/>
+  <advance width="583"/>
   <unicode hex="0417"/>
-  <anchor x="287" y="0" name="bottom"/>
-  <anchor x="287" y="694" name="top"/>
+  <anchor x="284" y="0" name="bottom"/>
+  <anchor x="284" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="414" y="-10"/>
-      <point x="503" y="61"/>
-      <point x="503" y="181" type="curve" smooth="yes"/>
-      <point x="503" y="293"/>
-      <point x="424" y="368"/>
-      <point x="305" y="369" type="curve"/>
-      <point x="315" y="364" type="line"/>
-      <point x="424" y="364"/>
-      <point x="488" y="424"/>
-      <point x="488" y="525" type="curve" smooth="yes"/>
-      <point x="488" y="637"/>
-      <point x="405" y="704"/>
-      <point x="265" y="704" type="curve" smooth="yes"/>
-      <point x="186" y="704"/>
-      <point x="119" y="683"/>
-      <point x="64" y="645" type="curve"/>
-      <point x="69" y="627" type="line"/>
-      <point x="133" y="666"/>
-      <point x="192" y="684"/>
-      <point x="260" y="684" type="curve" smooth="yes"/>
-      <point x="387" y="684"/>
-      <point x="465" y="622"/>
-      <point x="465" y="520" type="curve" smooth="yes"/>
-      <point x="465" y="428"/>
-      <point x="400" y="374"/>
-      <point x="288" y="374" type="curve" smooth="yes"/>
-      <point x="143" y="374" type="line"/>
-      <point x="143" y="355" type="line"/>
-      <point x="277" y="355" type="line" smooth="yes"/>
-      <point x="401" y="355"/>
-      <point x="481" y="286"/>
-      <point x="481" y="177" type="curve" smooth="yes"/>
-      <point x="481" y="72"/>
-      <point x="401" y="11"/>
-      <point x="270" y="11" type="curve" smooth="yes"/>
-      <point x="193" y="11"/>
-      <point x="113" y="31"/>
-      <point x="50" y="65" type="curve"/>
-      <point x="44" y="45" type="line"/>
-      <point x="106" y="11"/>
-      <point x="188" y="-10"/>
+      <point x="265" y="-10" type="curve" smooth="yes"/>
+      <point x="411" y="-10"/>
+      <point x="500" y="61"/>
+      <point x="500" y="181" type="curve" smooth="yes"/>
+      <point x="500" y="293"/>
+      <point x="421" y="368"/>
+      <point x="302" y="369" type="curve"/>
+      <point x="312" y="364" type="line"/>
+      <point x="421" y="364"/>
+      <point x="485" y="424"/>
+      <point x="485" y="525" type="curve" smooth="yes"/>
+      <point x="485" y="637"/>
+      <point x="402" y="704"/>
+      <point x="262" y="704" type="curve" smooth="yes"/>
+      <point x="183" y="704"/>
+      <point x="116" y="683"/>
+      <point x="61" y="645" type="curve"/>
+      <point x="66" y="627" type="line"/>
+      <point x="130" y="666"/>
+      <point x="189" y="684"/>
+      <point x="257" y="684" type="curve" smooth="yes"/>
+      <point x="384" y="684"/>
+      <point x="462" y="622"/>
+      <point x="462" y="520" type="curve" smooth="yes"/>
+      <point x="462" y="428"/>
+      <point x="397" y="374"/>
+      <point x="285" y="374" type="curve" smooth="yes"/>
+      <point x="140" y="374" type="line"/>
+      <point x="140" y="355" type="line"/>
+      <point x="274" y="355" type="line" smooth="yes"/>
+      <point x="398" y="355"/>
+      <point x="478" y="286"/>
+      <point x="478" y="177" type="curve" smooth="yes"/>
+      <point x="478" y="72"/>
+      <point x="398" y="11"/>
+      <point x="267" y="11" type="curve" smooth="yes"/>
+      <point x="190" y="11"/>
+      <point x="110" y="31"/>
+      <point x="47" y="65" type="curve"/>
+      <point x="41" y="45" type="line"/>
+      <point x="103" y="11"/>
+      <point x="185" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
index 85c89b44..50f00ecf 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedescender-cy" format="2">
-  <advance width="588"/>
+  <advance width="583"/>
   <unicode hex="0498"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="cedillacomb" xOffset="162"/>
+    <component base="cedillacomb" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
index d46cf13d..ce22726b 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_edieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zedieresis-cy" format="2">
-  <advance width="588"/>
+  <advance width="583"/>
   <unicode hex="04DE"/>
   <outline>
     <component base="Ze-cy"/>
-    <component base="dieresiscomb.case" xOffset="67"/>
+    <component base="dieresiscomb.case" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/a-cy.glif b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
index 166d8c72..a7126bcb 100644
--- a/src/Cantarell-Light.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="a-cy" format="2">
   <advance width="501"/>
   <unicode hex="0430"/>
-  <anchor x="233" y="480" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
index 0ae37cce..35f645fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="36"/>
+    <component base="brevecomb-cy" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acute.glif b/src/Cantarell-Light.ufo/glyphs/acute.glif
index 44530a23..2ae18c78 100644
--- a/src/Cantarell-Light.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="242"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-17"/>
+    <component base="acutecomb" xOffset="138"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
index 7ec2e5fa..30973d19 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="14"/>
+    <component base="dieresiscomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ampersand.glif b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
index 1564eecc..6c95b317 100644
--- a/src/Cantarell-Light.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ampersand" format="2">
-  <advance width="703"/>
+  <advance width="675"/>
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="299" y="-12" type="curve" smooth="yes"/>
-      <point x="426" y="-12"/>
-      <point x="545" y="93"/>
-      <point x="618" y="271" type="curve"/>
-      <point x="602" y="279" type="line"/>
-      <point x="529" y="107"/>
-      <point x="418" y="6"/>
-      <point x="302" y="6" type="curve" smooth="yes"/>
-      <point x="203" y="6"/>
-      <point x="117" y="79"/>
-      <point x="117" y="186" type="curve" smooth="yes"/>
-      <point x="117" y="402"/>
-      <point x="466" y="367"/>
-      <point x="466" y="568" type="curve" smooth="yes"/>
-      <point x="466" y="649"/>
-      <point x="409" y="704"/>
-      <point x="327" y="704" type="curve" smooth="yes"/>
-      <point x="237" y="704"/>
-      <point x="177" y="637"/>
-      <point x="177" y="537" type="curve" smooth="yes"/>
-      <point x="177" y="411"/>
-      <point x="279" y="280"/>
-      <point x="589" y="-5" type="curve"/>
-      <point x="602" y="10" type="line"/>
-      <point x="295" y="295"/>
-      <point x="198" y="418"/>
-      <point x="198" y="538" type="curve" smooth="yes"/>
-      <point x="198" y="628"/>
-      <point x="248" y="686"/>
-      <point x="325" y="686" type="curve" smooth="yes"/>
-      <point x="396" y="686"/>
-      <point x="446" y="636"/>
-      <point x="446" y="567" type="curve" smooth="yes"/>
-      <point x="446" y="382"/>
-      <point x="96" y="412"/>
-      <point x="96" y="184" type="curve" smooth="yes"/>
-      <point x="96" y="65"/>
-      <point x="191" y="-12"/>
+      <point x="283" y="-12" type="curve" smooth="yes"/>
+      <point x="410" y="-12"/>
+      <point x="529" y="93"/>
+      <point x="602" y="271" type="curve"/>
+      <point x="586" y="279" type="line"/>
+      <point x="513" y="107"/>
+      <point x="402" y="6"/>
+      <point x="286" y="6" type="curve" smooth="yes"/>
+      <point x="187" y="6"/>
+      <point x="101" y="79"/>
+      <point x="101" y="186" type="curve" smooth="yes"/>
+      <point x="101" y="402"/>
+      <point x="450" y="367"/>
+      <point x="450" y="568" type="curve" smooth="yes"/>
+      <point x="450" y="649"/>
+      <point x="393" y="704"/>
+      <point x="311" y="704" type="curve" smooth="yes"/>
+      <point x="221" y="704"/>
+      <point x="161" y="637"/>
+      <point x="161" y="537" type="curve" smooth="yes"/>
+      <point x="161" y="411"/>
+      <point x="263" y="280"/>
+      <point x="573" y="-5" type="curve"/>
+      <point x="586" y="10" type="line"/>
+      <point x="279" y="295"/>
+      <point x="182" y="418"/>
+      <point x="182" y="538" type="curve" smooth="yes"/>
+      <point x="182" y="628"/>
+      <point x="232" y="686"/>
+      <point x="309" y="686" type="curve" smooth="yes"/>
+      <point x="380" y="686"/>
+      <point x="430" y="636"/>
+      <point x="430" y="567" type="curve" smooth="yes"/>
+      <point x="430" y="382"/>
+      <point x="80" y="412"/>
+      <point x="80" y="184" type="curve" smooth="yes"/>
+      <point x="80" y="65"/>
+      <point x="175" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
index c2751f0c..c14bd1ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="226"/>
+  <advance width="148"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright" xOffset="-21"/>
+    <component base="quoteright" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/at.glif b/src/Cantarell-Light.ufo/glyphs/at.glif
index cf41bd63..9b614749 100644
--- a/src/Cantarell-Light.ufo/glyphs/at.glif
+++ b/src/Cantarell-Light.ufo/glyphs/at.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="at" format="2">
-  <advance width="1004"/>
+  <advance width="984"/>
   <unicode hex="0040"/>
   <outline>
     <contour>
-      <point x="501" y="-148" type="curve" smooth="yes"/>
-      <point x="569" y="-148"/>
-      <point x="633" y="-135"/>
-      <point x="675" y="-113" type="curve"/>
-      <point x="670" y="-98" type="line"/>
-      <point x="627" y="-122"/>
-      <point x="563" y="-133"/>
-      <point x="502" y="-133" type="curve" smooth="yes"/>
-      <point x="273" y="-133"/>
-      <point x="121" y="24"/>
-      <point x="121" y="265" type="curve" smooth="yes"/>
-      <point x="121" y="512"/>
-      <point x="280" y="687"/>
-      <point x="524" y="687" type="curve" smooth="yes"/>
-      <point x="743" y="687"/>
-      <point x="887" y="546"/>
-      <point x="887" y="326" type="curve" smooth="yes"/>
-      <point x="887" y="181"/>
-      <point x="824" y="86"/>
-      <point x="730" y="86" type="curve" smooth="yes"/>
-      <point x="679" y="86"/>
-      <point x="645" y="116"/>
-      <point x="645" y="162" type="curve"/>
-      <point x="626" y="162" type="line"/>
-      <point x="626" y="106"/>
-      <point x="666" y="69"/>
-      <point x="729" y="69" type="curve" smooth="yes"/>
-      <point x="835" y="69"/>
-      <point x="907" y="172"/>
-      <point x="907" y="329" type="curve" smooth="yes"/>
-      <point x="907" y="558"/>
-      <point x="755" y="704"/>
-      <point x="525" y="704" type="curve" smooth="yes"/>
-      <point x="269" y="704"/>
-      <point x="101" y="522"/>
-      <point x="101" y="265" type="curve" smooth="yes"/>
-      <point x="101" y="14"/>
-      <point x="260" y="-148"/>
+      <point x="491" y="-148" type="curve" smooth="yes"/>
+      <point x="559" y="-148"/>
+      <point x="623" y="-135"/>
+      <point x="665" y="-113" type="curve"/>
+      <point x="660" y="-98" type="line"/>
+      <point x="617" y="-122"/>
+      <point x="553" y="-133"/>
+      <point x="492" y="-133" type="curve" smooth="yes"/>
+      <point x="263" y="-133"/>
+      <point x="111" y="24"/>
+      <point x="111" y="265" type="curve" smooth="yes"/>
+      <point x="111" y="512"/>
+      <point x="270" y="687"/>
+      <point x="514" y="687" type="curve" smooth="yes"/>
+      <point x="733" y="687"/>
+      <point x="877" y="546"/>
+      <point x="877" y="326" type="curve" smooth="yes"/>
+      <point x="877" y="181"/>
+      <point x="814" y="86"/>
+      <point x="720" y="86" type="curve" smooth="yes"/>
+      <point x="669" y="86"/>
+      <point x="635" y="116"/>
+      <point x="635" y="162" type="curve"/>
+      <point x="616" y="162" type="line"/>
+      <point x="616" y="106"/>
+      <point x="656" y="69"/>
+      <point x="719" y="69" type="curve" smooth="yes"/>
+      <point x="825" y="69"/>
+      <point x="897" y="172"/>
+      <point x="897" y="329" type="curve" smooth="yes"/>
+      <point x="897" y="558"/>
+      <point x="745" y="704"/>
+      <point x="515" y="704" type="curve" smooth="yes"/>
+      <point x="259" y="704"/>
+      <point x="91" y="522"/>
+      <point x="91" y="265" type="curve" smooth="yes"/>
+      <point x="91" y="14"/>
+      <point x="250" y="-148"/>
     </contour>
     <contour>
-      <point x="484" y="59" type="curve" smooth="yes"/>
-      <point x="535" y="59"/>
-      <point x="595" y="82"/>
-      <point x="637" y="143" type="curve"/>
-      <point x="630" y="150" type="line"/>
-      <point x="576" y="89"/>
-      <point x="524" y="76"/>
-      <point x="487" y="76" type="curve" smooth="yes"/>
-      <point x="408" y="76"/>
-      <point x="353" y="141"/>
-      <point x="353" y="253" type="curve" smooth="yes"/>
-      <point x="353" y="381"/>
-      <point x="425" y="473"/>
-      <point x="520" y="473" type="curve" smooth="yes"/>
-      <point x="582" y="473"/>
-      <point x="622" y="434"/>
-      <point x="648" y="375" type="curve"/>
-      <point x="653" y="385" type="line"/>
-      <point x="635" y="448"/>
-      <point x="595" y="490"/>
-      <point x="524" y="490" type="curve" smooth="yes"/>
-      <point x="413" y="490"/>
-      <point x="332" y="387"/>
-      <point x="332" y="251" type="curve" smooth="yes"/>
-      <point x="332" y="130"/>
-      <point x="396" y="59"/>
+      <point x="474" y="59" type="curve" smooth="yes"/>
+      <point x="525" y="59"/>
+      <point x="585" y="82"/>
+      <point x="627" y="143" type="curve"/>
+      <point x="620" y="150" type="line"/>
+      <point x="566" y="89"/>
+      <point x="514" y="76"/>
+      <point x="477" y="76" type="curve" smooth="yes"/>
+      <point x="398" y="76"/>
+      <point x="343" y="141"/>
+      <point x="343" y="253" type="curve" smooth="yes"/>
+      <point x="343" y="381"/>
+      <point x="415" y="473"/>
+      <point x="510" y="473" type="curve" smooth="yes"/>
+      <point x="572" y="473"/>
+      <point x="612" y="434"/>
+      <point x="638" y="375" type="curve"/>
+      <point x="643" y="385" type="line"/>
+      <point x="625" y="448"/>
+      <point x="585" y="490"/>
+      <point x="514" y="490" type="curve" smooth="yes"/>
+      <point x="403" y="490"/>
+      <point x="322" y="387"/>
+      <point x="322" y="251" type="curve" smooth="yes"/>
+      <point x="322" y="130"/>
+      <point x="386" y="59"/>
     </contour>
     <contour>
-      <point x="626" y="162" type="line"/>
-      <point x="645" y="162" type="line"/>
-      <point x="664" y="478" type="line"/>
-      <point x="649" y="478" type="line"/>
-      <point x="640" y="396" type="line"/>
+      <point x="616" y="162" type="line"/>
+      <point x="635" y="162" type="line"/>
+      <point x="654" y="478" type="line"/>
+      <point x="639" y="478" type="line"/>
+      <point x="630" y="396" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/bar.glif b/src/Cantarell-Light.ufo/glyphs/bar.glif
index 8d888ff8..6b0f2c35 100644
--- a/src/Cantarell-Light.ufo/glyphs/bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/bar.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bar" format="2">
-  <advance width="265"/>
+  <advance width="259"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="123" y="-180" type="line"/>
-      <point x="142" y="-180" type="line"/>
-      <point x="142" y="739" type="line"/>
-      <point x="123" y="739" type="line"/>
+      <point x="120" y="-180" type="line"/>
+      <point x="139" y="-180" type="line"/>
+      <point x="139" y="739" type="line"/>
+      <point x="120" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/blank.glif b/src/Cantarell-Light.ufo/glyphs/blank.glif
index 871fcaa2..7fa4e6bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/blank.glif
+++ b/src/Cantarell-Light.ufo/glyphs/blank.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="blank" format="2">
-  <advance width="759"/>
+  <advance width="753"/>
   <unicode hex="2423"/>
   <note>
 uni2423
 </note>
   <outline>
     <contour>
-      <point x="123" y="0" type="line"/>
-      <point x="636" y="0" type="line"/>
-      <point x="636" y="116" type="line"/>
-      <point x="616" y="116" type="line"/>
-      <point x="616" y="17" type="line"/>
-      <point x="143" y="17" type="line"/>
-      <point x="143" y="116" type="line"/>
-      <point x="123" y="116" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="633" y="0" type="line"/>
+      <point x="633" y="116" type="line"/>
+      <point x="613" y="116" type="line"/>
+      <point x="613" y="17" type="line"/>
+      <point x="140" y="17" type="line"/>
+      <point x="140" y="116" type="line"/>
+      <point x="120" y="116" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/breve.glif b/src/Cantarell-Light.ufo/glyphs/breve.glif
index dd85f437..a9398b53 100644
--- a/src/Cantarell-Light.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="404"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-7"/>
+    <component base="brevecomb" xOffset="64"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
index 43133b12..cb614d89 100644
--- a/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brevecomb-cy.case.glif
@@ -3,7 +3,7 @@
   <anchor x="193" y="694" name="_top"/>
   <anchor x="193" y="892" name="top"/>
   <outline>
-    <component base="brevecomb-cy" yOffset="164"/>
+    <component base="brevecomb-cy" yOffset="174"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
index deb58056..93a1bfee 100644
--- a/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brevecomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="203" y="694" name="_top"/>
   <anchor x="203" y="805" name="top"/>
   <outline>
-    <component base="brevecomb" yOffset="164"/>
+    <component base="brevecomb" xOffset="15" yOffset="176"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
index e6be0ea7..cdff8035 100644
--- a/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/breveinvertedcomb.case.glif
@@ -3,7 +3,7 @@
   <anchor x="206" y="694" name="_top"/>
   <anchor x="206" y="872" name="top"/>
   <outline>
-    <component base="breveinvertedcomb" yOffset="160"/>
+    <component base="breveinvertedcomb" yOffset="170"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/brokenbar.glif b/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
index 1e1961da..3f37a60a 100644
--- a/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brokenbar" format="2">
-  <advance width="266"/>
+  <advance width="260"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="123" y="-181" type="line"/>
-      <point x="143" y="-181" type="line"/>
-      <point x="143" y="181" type="line"/>
-      <point x="123" y="181" type="line"/>
+      <point x="120" y="-181" type="line"/>
+      <point x="140" y="-181" type="line"/>
+      <point x="140" y="181" type="line"/>
+      <point x="120" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="123" y="412" type="line"/>
-      <point x="143" y="412" type="line"/>
-      <point x="143" y="740" type="line"/>
-      <point x="123" y="740" type="line"/>
+      <point x="120" y="412" type="line"/>
+      <point x="140" y="412" type="line"/>
+      <point x="140" y="740" type="line"/>
+      <point x="120" y="740" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/caron.glif b/src/Cantarell-Light.ufo/glyphs/caron.glif
index 3e4db130..f36b2b92 100644
--- a/src/Cantarell-Light.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="362"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="-15"/>
+    <component base="caroncomb" xOffset="71"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cedilla.glif b/src/Cantarell-Light.ufo/glyphs/cedilla.glif
index d08fdc1a..1599ae29 100644
--- a/src/Cantarell-Light.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="314"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb"/>
+    <component base="cedillacomb" xOffset="95"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflex.glif b/src/Cantarell-Light.ufo/glyphs/circumflex.glif
index 419f6e21..d32a55c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="362"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-11"/>
+    <component base="circumflexcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
index 2bf2a279..0f02a8c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="222"/>
+  <advance width="144"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/copyright.glif b/src/Cantarell-Light.ufo/glyphs/copyright.glif
index 29364fd3..277e19bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/copyright.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="copyright" format="2">
-  <advance width="886"/>
+  <advance width="868"/>
   <unicode hex="00A9"/>
   <outline>
     <contour>
-      <point x="442" y="-3" type="curve" smooth="yes"/>
-      <point x="646" y="-3"/>
-      <point x="782" y="137"/>
-      <point x="782" y="347" type="curve" smooth="yes"/>
-      <point x="782" y="561"/>
-      <point x="647" y="704"/>
-      <point x="444" y="704" type="curve" smooth="yes"/>
-      <point x="240" y="704"/>
-      <point x="104" y="560"/>
-      <point x="104" y="344" type="curve" smooth="yes"/>
-      <point x="104" y="136"/>
-      <point x="239" y="-3"/>
+      <point x="433" y="-3" type="curve" smooth="yes"/>
+      <point x="637" y="-3"/>
+      <point x="773" y="137"/>
+      <point x="773" y="347" type="curve" smooth="yes"/>
+      <point x="773" y="561"/>
+      <point x="638" y="704"/>
+      <point x="435" y="704" type="curve" smooth="yes"/>
+      <point x="231" y="704"/>
+      <point x="95" y="560"/>
+      <point x="95" y="344" type="curve" smooth="yes"/>
+      <point x="95" y="136"/>
+      <point x="230" y="-3"/>
     </contour>
     <contour>
-      <point x="452" y="134" type="curve" smooth="yes"/>
-      <point x="491" y="134"/>
-      <point x="534" y="143"/>
-      <point x="571" y="160" type="curve"/>
-      <point x="566" y="176" type="line"/>
-      <point x="532" y="162"/>
-      <point x="491" y="154"/>
-      <point x="457" y="154" type="curve" smooth="yes"/>
-      <point x="351" y="154"/>
-      <point x="280" y="232"/>
-      <point x="280" y="350" type="curve" smooth="yes"/>
-      <point x="280" y="466"/>
-      <point x="351" y="542"/>
-      <point x="460" y="542" type="curve" smooth="yes"/>
-      <point x="495" y="542"/>
-      <point x="532" y="534"/>
-      <point x="565" y="520" type="curve"/>
-      <point x="572" y="537" type="line"/>
-      <point x="539" y="553"/>
-      <point x="501" y="561"/>
-      <point x="462" y="561" type="curve" smooth="yes"/>
-      <point x="339" y="561"/>
-      <point x="257" y="474"/>
-      <point x="257" y="343" type="curve" smooth="yes"/>
-      <point x="257" y="218"/>
-      <point x="335" y="134"/>
+      <point x="443" y="134" type="curve" smooth="yes"/>
+      <point x="482" y="134"/>
+      <point x="525" y="143"/>
+      <point x="562" y="160" type="curve"/>
+      <point x="557" y="176" type="line"/>
+      <point x="523" y="162"/>
+      <point x="482" y="154"/>
+      <point x="448" y="154" type="curve" smooth="yes"/>
+      <point x="342" y="154"/>
+      <point x="271" y="232"/>
+      <point x="271" y="350" type="curve" smooth="yes"/>
+      <point x="271" y="466"/>
+      <point x="342" y="542"/>
+      <point x="451" y="542" type="curve" smooth="yes"/>
+      <point x="486" y="542"/>
+      <point x="523" y="534"/>
+      <point x="556" y="520" type="curve"/>
+      <point x="563" y="537" type="line"/>
+      <point x="530" y="553"/>
+      <point x="492" y="561"/>
+      <point x="453" y="561" type="curve" smooth="yes"/>
+      <point x="330" y="561"/>
+      <point x="248" y="474"/>
+      <point x="248" y="343" type="curve" smooth="yes"/>
+      <point x="248" y="218"/>
+      <point x="326" y="134"/>
     </contour>
     <contour>
-      <point x="445" y="15" type="curve" smooth="yes"/>
-      <point x="253" y="15"/>
-      <point x="125" y="148"/>
-      <point x="125" y="347" type="curve" smooth="yes"/>
-      <point x="125" y="550"/>
-      <point x="251" y="686"/>
-      <point x="441" y="686" type="curve" smooth="yes"/>
-      <point x="634" y="686"/>
-      <point x="762" y="549"/>
-      <point x="762" y="344" type="curve" smooth="yes"/>
-      <point x="762" y="147"/>
-      <point x="635" y="15"/>
+      <point x="436" y="15" type="curve" smooth="yes"/>
+      <point x="244" y="15"/>
+      <point x="116" y="148"/>
+      <point x="116" y="347" type="curve" smooth="yes"/>
+      <point x="116" y="550"/>
+      <point x="242" y="686"/>
+      <point x="432" y="686" type="curve" smooth="yes"/>
+      <point x="625" y="686"/>
+      <point x="753" y="549"/>
+      <point x="753" y="344" type="curve" smooth="yes"/>
+      <point x="753" y="147"/>
+      <point x="626" y="15"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dagger.glif b/src/Cantarell-Light.ufo/glyphs/dagger.glif
index 5c6616ea..1957e183 100644
--- a/src/Cantarell-Light.ufo/glyphs/dagger.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dagger.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dagger" format="2">
-  <advance width="430"/>
+  <advance width="400"/>
   <unicode hex="2020"/>
   <outline>
     <contour>
-      <point x="203" y="0" type="line"/>
-      <point x="225" y="0" type="line"/>
-      <point x="222" y="526" type="line"/>
-      <point x="225" y="694" type="line"/>
-      <point x="203" y="694" type="line"/>
-      <point x="205" y="526" type="line"/>
+      <point x="188" y="0" type="line"/>
+      <point x="210" y="0" type="line"/>
+      <point x="207" y="526" type="line"/>
+      <point x="210" y="694" type="line"/>
+      <point x="188" y="694" type="line"/>
+      <point x="190" y="526" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="517" type="line"/>
-      <point x="210" y="519" type="line"/>
-      <point x="210" y="533" type="line"/>
-      <point x="80" y="536" type="line"/>
+      <point x="65" y="517" type="line"/>
+      <point x="195" y="519" type="line"/>
+      <point x="195" y="533" type="line"/>
+      <point x="65" y="536" type="line"/>
     </contour>
     <contour>
-      <point x="350" y="517" type="line"/>
-      <point x="350" y="536" type="line"/>
-      <point x="216" y="533" type="line"/>
-      <point x="216" y="519" type="line"/>
+      <point x="335" y="517" type="line"/>
+      <point x="335" y="536" type="line"/>
+      <point x="201" y="533" type="line"/>
+      <point x="201" y="519" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
index 604a1289..73540776 100644
--- a/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/daggerdbl.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daggerdbl" format="2">
-  <advance width="440"/>
+  <advance width="406"/>
   <unicode hex="2021"/>
   <outline>
     <contour>
-      <point x="209" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="227" y="175" type="line"/>
-      <point x="230" y="346" type="line"/>
-      <point x="227" y="506" type="line"/>
-      <point x="230" y="694" type="line"/>
-      <point x="209" y="694" type="line"/>
-      <point x="211" y="506" type="line"/>
-      <point x="208" y="346" type="line"/>
-      <point x="211" y="175" type="line"/>
+      <point x="192" y="0" type="line"/>
+      <point x="213" y="0" type="line"/>
+      <point x="210" y="175" type="line"/>
+      <point x="213" y="346" type="line"/>
+      <point x="210" y="506" type="line"/>
+      <point x="213" y="694" type="line"/>
+      <point x="192" y="694" type="line"/>
+      <point x="194" y="506" type="line"/>
+      <point x="191" y="346" type="line"/>
+      <point x="194" y="175" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="165" type="line"/>
-      <point x="215" y="167" type="line"/>
-      <point x="215" y="181" type="line"/>
-      <point x="95" y="184" type="line"/>
+      <point x="78" y="165" type="line"/>
+      <point x="198" y="167" type="line"/>
+      <point x="198" y="181" type="line"/>
+      <point x="78" y="184" type="line"/>
     </contour>
     <contour>
-      <point x="345" y="165" type="line"/>
-      <point x="345" y="184" type="line"/>
-      <point x="222" y="181" type="line"/>
-      <point x="222" y="167" type="line"/>
+      <point x="328" y="165" type="line"/>
+      <point x="328" y="184" type="line"/>
+      <point x="205" y="181" type="line"/>
+      <point x="205" y="167" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="511" type="line"/>
-      <point x="215" y="513" type="line"/>
-      <point x="215" y="527" type="line"/>
-      <point x="95" y="530" type="line"/>
+      <point x="78" y="511" type="line"/>
+      <point x="198" y="513" type="line"/>
+      <point x="198" y="527" type="line"/>
+      <point x="78" y="530" type="line"/>
     </contour>
     <contour>
-      <point x="345" y="511" type="line"/>
-      <point x="345" y="530" type="line"/>
-      <point x="222" y="527" type="line"/>
-      <point x="222" y="513" type="line"/>
+      <point x="328" y="511" type="line"/>
+      <point x="328" y="530" type="line"/>
+      <point x="205" y="527" type="line"/>
+      <point x="205" y="513" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresis.glif b/src/Cantarell-Light.ufo/glyphs/dieresis.glif
index 96ec4eec..0706b8e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="438"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-1"/>
+    <component base="dieresiscomb" xOffset="31"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
index d9a0c214..3b3aa1a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="238"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="27"/>
+    <component base="dotaccentcomb" xOffset="131"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
index 537bbcea..e2828413 100644
--- a/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="501"/>
+  <advance width="326"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
index e017d335..32d73f0b 100644
--- a/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/downA_rrow.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="downArrow" format="2">
-  <advance width="646"/>
+  <advance width="616"/>
   <unicode hex="2193"/>
   <note>
 arrowdown
 </note>
   <outline>
-    <component base="upArrow" xScale="-1" yScale="-1" xOffset="646" yOffset="642"/>
+    <component base="upArrow" xScale="-1" yScale="-1" xOffset="616" yOffset="642"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.glif b/src/Cantarell-Light.ufo/glyphs/eight.glif
index de5bedba..071cf529 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight" format="2">
-  <advance width="583"/>
+  <advance width="575"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="513" y="57"/>
-      <point x="513" y="163" type="curve" smooth="yes"/>
-      <point x="513" y="387"/>
-      <point x="124" y="324"/>
-      <point x="124" y="540" type="curve" smooth="yes"/>
-      <point x="124" y="629"/>
-      <point x="185" y="687"/>
-      <point x="283" y="687" type="curve" smooth="yes"/>
-      <point x="381" y="687"/>
-      <point x="456" y="628"/>
-      <point x="456" y="543" type="curve" smooth="yes"/>
-      <point x="456" y="460"/>
-      <point x="384" y="397"/>
-      <point x="275" y="369" type="curve"/>
-      <point x="291" y="358" type="line"/>
-      <point x="404" y="385"/>
-      <point x="475" y="454"/>
-      <point x="475" y="543" type="curve" smooth="yes"/>
-      <point x="475" y="639"/>
-      <point x="394" y="704"/>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="105" y="639"/>
-      <point x="105" y="538" type="curve" smooth="yes"/>
-      <point x="105" y="309"/>
-      <point x="493" y="374"/>
-      <point x="493" y="161" type="curve" smooth="yes"/>
-      <point x="493" y="67"/>
-      <point x="416" y="7"/>
-      <point x="298" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="275" y="352" type="curve"/>
-      <point x="259" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="509" y="57"/>
+      <point x="509" y="163" type="curve" smooth="yes"/>
+      <point x="509" y="387"/>
+      <point x="120" y="324"/>
+      <point x="120" y="540" type="curve" smooth="yes"/>
+      <point x="120" y="629"/>
+      <point x="181" y="687"/>
+      <point x="279" y="687" type="curve" smooth="yes"/>
+      <point x="377" y="687"/>
+      <point x="452" y="628"/>
+      <point x="452" y="543" type="curve" smooth="yes"/>
+      <point x="452" y="460"/>
+      <point x="380" y="397"/>
+      <point x="271" y="369" type="curve"/>
+      <point x="287" y="358" type="line"/>
+      <point x="400" y="385"/>
+      <point x="471" y="454"/>
+      <point x="471" y="543" type="curve" smooth="yes"/>
+      <point x="471" y="639"/>
+      <point x="390" y="704"/>
+      <point x="281" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="101" y="639"/>
+      <point x="101" y="538" type="curve" smooth="yes"/>
+      <point x="101" y="309"/>
+      <point x="489" y="374"/>
+      <point x="489" y="161" type="curve" smooth="yes"/>
+      <point x="489" y="67"/>
+      <point x="412" y="7"/>
+      <point x="294" y="7" type="curve" smooth="yes"/>
+      <point x="173" y="7"/>
+      <point x="90" y="71"/>
+      <point x="90" y="166" type="curve" smooth="yes"/>
+      <point x="90" y="254"/>
+      <point x="162" y="325"/>
+      <point x="271" y="353" type="curve"/>
+      <point x="255" y="364" type="line"/>
+      <point x="144" y="338"/>
+      <point x="70" y="260"/>
+      <point x="70" y="164" type="curve" smooth="yes"/>
+      <point x="70" y="60"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
index de804c03..1d421865 100644
--- a/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eight.osf.glif
@@ -1,52 +1,52 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight.osf" format="2">
-  <advance width="583"/>
+  <advance width="575"/>
   <outline>
     <contour>
-      <point x="296" y="-10" type="curve" smooth="yes"/>
-      <point x="426" y="-10"/>
-      <point x="513" y="57"/>
-      <point x="513" y="163" type="curve" smooth="yes"/>
-      <point x="513" y="389"/>
-      <point x="118" y="324"/>
-      <point x="118" y="540" type="curve" smooth="yes"/>
-      <point x="118" y="629"/>
-      <point x="185" y="687"/>
-      <point x="283" y="687" type="curve" smooth="yes"/>
-      <point x="381" y="687"/>
-      <point x="456" y="628"/>
-      <point x="456" y="543" type="curve" smooth="yes"/>
-      <point x="456" y="460"/>
-      <point x="384" y="397"/>
-      <point x="275" y="369" type="curve"/>
-      <point x="291" y="358" type="line"/>
-      <point x="404" y="385"/>
-      <point x="475" y="454"/>
-      <point x="475" y="543" type="curve" smooth="yes"/>
-      <point x="475" y="639"/>
-      <point x="394" y="704"/>
-      <point x="285" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="99" y="639"/>
-      <point x="99" y="538" type="curve" smooth="yes"/>
-      <point x="99" y="307"/>
-      <point x="493" y="372"/>
-      <point x="493" y="161" type="curve" smooth="yes"/>
-      <point x="493" y="67"/>
-      <point x="416" y="7"/>
-      <point x="298" y="7" type="curve" smooth="yes"/>
-      <point x="177" y="7"/>
-      <point x="94" y="71"/>
-      <point x="94" y="166" type="curve" smooth="yes"/>
-      <point x="94" y="254"/>
-      <point x="166" y="325"/>
-      <point x="275" y="352" type="curve"/>
-      <point x="259" y="363" type="line"/>
-      <point x="148" y="338"/>
-      <point x="74" y="260"/>
-      <point x="74" y="164" type="curve" smooth="yes"/>
-      <point x="74" y="60"/>
-      <point x="163" y="-10"/>
+      <point x="292" y="-10" type="curve" smooth="yes"/>
+      <point x="422" y="-10"/>
+      <point x="509" y="57"/>
+      <point x="509" y="163" type="curve" smooth="yes"/>
+      <point x="509" y="389"/>
+      <point x="114" y="324"/>
+      <point x="114" y="540" type="curve" smooth="yes"/>
+      <point x="114" y="629"/>
+      <point x="181" y="687"/>
+      <point x="279" y="687" type="curve" smooth="yes"/>
+      <point x="377" y="687"/>
+      <point x="452" y="628"/>
+      <point x="452" y="543" type="curve" smooth="yes"/>
+      <point x="452" y="460"/>
+      <point x="380" y="397"/>
+      <point x="271" y="369" type="curve"/>
+      <point x="287" y="358" type="line"/>
+      <point x="400" y="385"/>
+      <point x="471" y="454"/>
+      <point x="471" y="543" type="curve" smooth="yes"/>
+      <point x="471" y="639"/>
+      <point x="390" y="704"/>
+      <point x="281" y="704" type="curve" smooth="yes"/>
+      <point x="171" y="704"/>
+      <point x="95" y="639"/>
+      <point x="95" y="538" type="curve" smooth="yes"/>
+      <point x="95" y="307"/>
+      <point x="489" y="372"/>
+      <point x="489" y="161" type="curve" smooth="yes"/>
+      <point x="489" y="67"/>
+      <point x="412" y="7"/>
+      <point x="294" y="7" type="curve" smooth="yes"/>
+      <point x="173" y="7"/>
+      <point x="90" y="71"/>
+      <point x="90" y="166" type="curve" smooth="yes"/>
+      <point x="90" y="254"/>
+      <point x="162" y="325"/>
+      <point x="271" y="352" type="curve"/>
+      <point x="255" y="363" type="line"/>
+      <point x="144" y="338"/>
+      <point x="70" y="260"/>
+      <point x="70" y="164" type="curve" smooth="yes"/>
+      <point x="70" y="60"/>
+      <point x="159" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/emptyset.glif b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
index d8fdf683..20e3d0f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emptyset" format="2">
-  <advance width="733"/>
+  <advance width="728"/>
   <unicode hex="2205"/>
   <outline>
     <contour>
-      <point x="172" y="48" type="line"/>
-      <point x="576" y="647" type="line"/>
-      <point x="562" y="657" type="line"/>
-      <point x="158" y="58" type="line"/>
+      <point x="169" y="48" type="line"/>
+      <point x="573" y="647" type="line"/>
+      <point x="559" y="657" type="line"/>
+      <point x="155" y="58" type="line"/>
     </contour>
     <contour>
-      <point x="366" y="74" type="curve" smooth="yes"/>
-      <point x="528" y="74"/>
-      <point x="636" y="181"/>
-      <point x="636" y="342" type="curve" smooth="yes"/>
-      <point x="636" y="502"/>
-      <point x="529" y="609"/>
-      <point x="368" y="609" type="curve" smooth="yes"/>
-      <point x="206" y="609"/>
-      <point x="98" y="501"/>
-      <point x="98" y="340" type="curve" smooth="yes"/>
-      <point x="98" y="180"/>
-      <point x="205" y="74"/>
+      <point x="363" y="74" type="curve" smooth="yes"/>
+      <point x="525" y="74"/>
+      <point x="633" y="181"/>
+      <point x="633" y="342" type="curve" smooth="yes"/>
+      <point x="633" y="502"/>
+      <point x="526" y="609"/>
+      <point x="365" y="609" type="curve" smooth="yes"/>
+      <point x="203" y="609"/>
+      <point x="95" y="501"/>
+      <point x="95" y="340" type="curve" smooth="yes"/>
+      <point x="95" y="180"/>
+      <point x="202" y="74"/>
     </contour>
     <contour>
-      <point x="368" y="92" type="curve" smooth="yes"/>
-      <point x="218" y="92"/>
-      <point x="118" y="192"/>
-      <point x="118" y="342" type="curve" smooth="yes"/>
-      <point x="118" y="491"/>
-      <point x="217" y="591"/>
-      <point x="365" y="591" type="curve" smooth="yes"/>
-      <point x="516" y="591"/>
-      <point x="616" y="491"/>
-      <point x="616" y="340" type="curve" smooth="yes"/>
-      <point x="616" y="191"/>
-      <point x="517" y="92"/>
+      <point x="365" y="92" type="curve" smooth="yes"/>
+      <point x="215" y="92"/>
+      <point x="115" y="192"/>
+      <point x="115" y="342" type="curve" smooth="yes"/>
+      <point x="115" y="491"/>
+      <point x="214" y="591"/>
+      <point x="362" y="591" type="curve" smooth="yes"/>
+      <point x="513" y="591"/>
+      <point x="613" y="491"/>
+      <point x="613" y="340" type="curve" smooth="yes"/>
+      <point x="613" y="191"/>
+      <point x="514" y="92"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/estimated.glif b/src/Cantarell-Light.ufo/glyphs/estimated.glif
index a52ba08a..fc3b3d28 100644
--- a/src/Cantarell-Light.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Light.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="912"/>
+  <advance width="881"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="460" y="-10" type="curve" smooth="yes"/>
-      <point x="591" y="-10"/>
-      <point x="715" y="42"/>
-      <point x="787" y="119" type="curve"/>
-      <point x="721" y="119" type="line"/>
-      <point x="649" y="62"/>
-      <point x="557" y="36"/>
-      <point x="468" y="36" type="curve" smooth="yes"/>
-      <point x="346" y="36"/>
-      <point x="272" y="84"/>
-      <point x="225" y="145" type="curve"/>
-      <point x="225" y="315" type="line"/>
-      <point x="808" y="315" type="line"/>
-      <point x="808" y="545"/>
-      <point x="691" y="704"/>
-      <point x="463" y="704" type="curve" smooth="yes"/>
-      <point x="232" y="704"/>
-      <point x="114" y="541"/>
-      <point x="114" y="339" type="curve" smooth="yes"/>
-      <point x="114" y="123"/>
-      <point x="250" y="-10"/>
+      <point x="444" y="-10" type="curve" smooth="yes"/>
+      <point x="575" y="-10"/>
+      <point x="699" y="42"/>
+      <point x="771" y="119" type="curve"/>
+      <point x="705" y="119" type="line"/>
+      <point x="633" y="62"/>
+      <point x="541" y="36"/>
+      <point x="452" y="36" type="curve" smooth="yes"/>
+      <point x="330" y="36"/>
+      <point x="256" y="84"/>
+      <point x="209" y="145" type="curve"/>
+      <point x="209" y="315" type="line"/>
+      <point x="792" y="315" type="line"/>
+      <point x="792" y="545"/>
+      <point x="675" y="704"/>
+      <point x="447" y="704" type="curve" smooth="yes"/>
+      <point x="216" y="704"/>
+      <point x="98" y="541"/>
+      <point x="98" y="339" type="curve" smooth="yes"/>
+      <point x="98" y="123"/>
+      <point x="234" y="-10"/>
     </contour>
     <contour>
-      <point x="225" y="358" type="line"/>
-      <point x="225" y="535" type="line"/>
-      <point x="271" y="619"/>
-      <point x="346" y="662"/>
-      <point x="460" y="662" type="curve" smooth="yes"/>
-      <point x="574" y="662"/>
-      <point x="648" y="619"/>
-      <point x="694" y="535" type="curve"/>
-      <point x="694" y="358" type="line"/>
+      <point x="209" y="358" type="line"/>
+      <point x="209" y="535" type="line"/>
+      <point x="255" y="619"/>
+      <point x="330" y="662"/>
+      <point x="444" y="662" type="curve" smooth="yes"/>
+      <point x="558" y="662"/>
+      <point x="632" y="619"/>
+      <point x="678" y="535" type="curve"/>
+      <point x="678" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
index 22d19c3c..00beaa1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="475"/>
+  <advance width="407"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
index ad21e32b..6f275c57 100644
--- a/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="242"/>
+  <advance width="150"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/grave.glif b/src/Cantarell-Light.ufo/glyphs/grave.glif
index 74e97c15..bdeed7ba 100644
--- a/src/Cantarell-Light.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="242"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb" xOffset="3"/>
+    <component base="gravecomb" xOffset="118"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
index 5312acb5..c21380f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="402"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-55"/>
+    <component base="hungarumlautcomb" xOffset="73"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
index d539e29f..ff6bb122 100644
--- a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="ie-cy" format="2">
   <advance width="520"/>
   <unicode hex="0435"/>
-  <anchor x="247" y="480" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
index 2796f9fe..2bed22b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="50"/>
+    <component base="brevecomb-cy" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
index 6ed01eca..fa827004 100644
--- a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="63"/>
+    <component base="gravecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/increment.glif b/src/Cantarell-Light.ufo/glyphs/increment.glif
index c9799ae5..d8fda2ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/increment.glif
+++ b/src/Cantarell-Light.ufo/glyphs/increment.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="increment" format="2">
-  <advance width="678"/>
+  <advance width="648"/>
   <unicode hex="2206"/>
   <outline>
     <contour>
-      <point x="84" y="1" type="line"/>
-      <point x="594" y="1" type="line"/>
-      <point x="594" y="14" type="line"/>
-      <point x="345" y="694" type="line"/>
-      <point x="327" y="694" type="line"/>
-      <point x="84" y="14" type="line"/>
+      <point x="69" y="1" type="line"/>
+      <point x="579" y="1" type="line"/>
+      <point x="579" y="14" type="line"/>
+      <point x="330" y="694" type="line"/>
+      <point x="312" y="694" type="line"/>
+      <point x="69" y="14" type="line"/>
     </contour>
     <contour>
-      <point x="108" y="18" type="line"/>
-      <point x="336" y="666" type="line"/>
-      <point x="569" y="18" type="line"/>
+      <point x="93" y="18" type="line"/>
+      <point x="321" y="666" type="line"/>
+      <point x="554" y="18" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/integral.glif b/src/Cantarell-Light.ufo/glyphs/integral.glif
index 16154d5a..f7556e79 100644
--- a/src/Cantarell-Light.ufo/glyphs/integral.glif
+++ b/src/Cantarell-Light.ufo/glyphs/integral.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="integral" format="2">
-  <advance width="411"/>
+  <advance width="376"/>
   <unicode hex="222B"/>
   <outline>
     <contour>
-      <point x="180" y="-170" type="curve" smooth="yes"/>
-      <point x="244" y="-170"/>
-      <point x="288" y="-108"/>
-      <point x="288" y="-15" type="curve" smooth="yes"/>
-      <point x="288" y="157"/>
-      <point x="137" y="394"/>
-      <point x="137" y="580" type="curve" smooth="yes"/>
-      <point x="137" y="667"/>
-      <point x="170" y="728"/>
-      <point x="235" y="728" type="curve" smooth="yes"/>
-      <point x="255" y="728"/>
-      <point x="295" y="721"/>
-      <point x="315" y="712" type="curve"/>
-      <point x="321" y="729" type="line"/>
-      <point x="304" y="737"/>
-      <point x="266" y="746"/>
-      <point x="238" y="746" type="curve" smooth="yes"/>
-      <point x="159" y="746"/>
-      <point x="118" y="675"/>
-      <point x="118" y="576" type="curve" smooth="yes"/>
-      <point x="118" y="388"/>
-      <point x="268" y="145"/>
-      <point x="268" y="-19" type="curve" smooth="yes"/>
-      <point x="268" y="-99"/>
-      <point x="232" y="-152"/>
-      <point x="180" y="-152" type="curve" smooth="yes"/>
-      <point x="160" y="-152"/>
-      <point x="137" y="-146"/>
-      <point x="104" y="-131" type="curve"/>
-      <point x="98" y="-147" type="line"/>
-      <point x="132" y="-163"/>
-      <point x="158" y="-170"/>
+      <point x="162" y="-170" type="curve" smooth="yes"/>
+      <point x="226" y="-170"/>
+      <point x="270" y="-108"/>
+      <point x="270" y="-15" type="curve" smooth="yes"/>
+      <point x="270" y="157"/>
+      <point x="119" y="394"/>
+      <point x="119" y="580" type="curve" smooth="yes"/>
+      <point x="119" y="667"/>
+      <point x="152" y="728"/>
+      <point x="217" y="728" type="curve" smooth="yes"/>
+      <point x="237" y="728"/>
+      <point x="277" y="721"/>
+      <point x="297" y="712" type="curve"/>
+      <point x="303" y="729" type="line"/>
+      <point x="286" y="737"/>
+      <point x="248" y="746"/>
+      <point x="220" y="746" type="curve" smooth="yes"/>
+      <point x="141" y="746"/>
+      <point x="100" y="675"/>
+      <point x="100" y="576" type="curve" smooth="yes"/>
+      <point x="100" y="388"/>
+      <point x="250" y="145"/>
+      <point x="250" y="-19" type="curve" smooth="yes"/>
+      <point x="250" y="-99"/>
+      <point x="214" y="-152"/>
+      <point x="162" y="-152" type="curve" smooth="yes"/>
+      <point x="142" y="-152"/>
+      <point x="119" y="-146"/>
+      <point x="86" y="-131" type="curve"/>
+      <point x="80" y="-147" type="line"/>
+      <point x="114" y="-163"/>
+      <point x="140" y="-170"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/io-cy.glif b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
index e2429943..b8b4536a 100644
--- a/src/Cantarell-Light.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="28"/>
+    <component base="dieresiscomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
index 7f51f16c..e60589f8 100644
--- a/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/leftA_rrow.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="leftArrow" format="2">
-  <advance width="694"/>
+  <advance width="664"/>
   <unicode hex="2190"/>
   <note>
 arrowleft
 </note>
   <outline>
-    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="694" yOffset="643"/>
+    <component base="rightArrow" xScale="-1" yScale="-1" xOffset="664" yOffset="643"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
index 334b2c7e..ca2723ef 100644
--- a/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/literS_ign.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="literSign" format="2">
-  <advance width="462"/>
+  <advance width="429"/>
   <unicode hex="2113"/>
   <outline>
     <contour>
-      <point x="285" y="-10" type="curve" smooth="yes"/>
-      <point x="308" y="-10"/>
-      <point x="333" y="-3"/>
-      <point x="355" y="10" type="curve"/>
-      <point x="350" y="24" type="line"/>
-      <point x="330" y="13"/>
-      <point x="307" y="7"/>
-      <point x="288" y="7" type="curve" smooth="yes"/>
-      <point x="236" y="7"/>
-      <point x="202" y="53"/>
-      <point x="202" y="120" type="curve" smooth="yes"/>
-      <point x="202" y="547" type="line" smooth="yes"/>
-      <point x="202" y="657"/>
-      <point x="230" y="731"/>
-      <point x="274" y="731" type="curve" smooth="yes"/>
-      <point x="309" y="731"/>
-      <point x="334" y="684"/>
-      <point x="334" y="616" type="curve" smooth="yes"/>
-      <point x="334" y="522"/>
-      <point x="278" y="405"/>
-      <point x="79" y="138" type="curve"/>
-      <point x="91" y="128" type="line"/>
-      <point x="284" y="385"/>
-      <point x="354" y="512"/>
-      <point x="354" y="618" type="curve" smooth="yes"/>
-      <point x="354" y="695"/>
-      <point x="323" y="749"/>
-      <point x="276" y="749" type="curve" smooth="yes"/>
-      <point x="219" y="749"/>
-      <point x="182" y="667"/>
-      <point x="182" y="544" type="curve" smooth="yes"/>
-      <point x="182" y="117" type="line" smooth="yes"/>
-      <point x="182" y="43"/>
-      <point x="222" y="-10"/>
+      <point x="270" y="-10" type="curve" smooth="yes"/>
+      <point x="293" y="-10"/>
+      <point x="318" y="-3"/>
+      <point x="340" y="10" type="curve"/>
+      <point x="335" y="24" type="line"/>
+      <point x="315" y="13"/>
+      <point x="292" y="7"/>
+      <point x="273" y="7" type="curve" smooth="yes"/>
+      <point x="221" y="7"/>
+      <point x="187" y="53"/>
+      <point x="187" y="120" type="curve" smooth="yes"/>
+      <point x="187" y="547" type="line" smooth="yes"/>
+      <point x="187" y="657"/>
+      <point x="215" y="731"/>
+      <point x="259" y="731" type="curve" smooth="yes"/>
+      <point x="294" y="731"/>
+      <point x="319" y="684"/>
+      <point x="319" y="616" type="curve" smooth="yes"/>
+      <point x="319" y="522"/>
+      <point x="263" y="405"/>
+      <point x="64" y="138" type="curve"/>
+      <point x="76" y="128" type="line"/>
+      <point x="269" y="385"/>
+      <point x="339" y="512"/>
+      <point x="339" y="618" type="curve" smooth="yes"/>
+      <point x="339" y="695"/>
+      <point x="308" y="749"/>
+      <point x="261" y="749" type="curve" smooth="yes"/>
+      <point x="204" y="749"/>
+      <point x="167" y="667"/>
+      <point x="167" y="544" type="curve" smooth="yes"/>
+      <point x="167" y="117" type="line" smooth="yes"/>
+      <point x="167" y="43"/>
+      <point x="207" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lozenge.glif b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
index 2f065887..034af270 100644
--- a/src/Cantarell-Light.ufo/glyphs/lozenge.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lozenge.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lozenge" format="2">
-  <advance width="555"/>
+  <advance width="533"/>
   <unicode hex="25CA"/>
   <outline>
     <contour>
-      <point x="266" y="0" type="line"/>
-      <point x="288" y="0" type="line"/>
-      <point x="471" y="357" type="line"/>
-      <point x="287" y="694" type="line"/>
-      <point x="268" y="694" type="line"/>
-      <point x="84" y="357" type="line"/>
+      <point x="255" y="0" type="line"/>
+      <point x="277" y="0" type="line"/>
+      <point x="460" y="357" type="line"/>
+      <point x="276" y="694" type="line"/>
+      <point x="257" y="694" type="line"/>
+      <point x="73" y="357" type="line"/>
     </contour>
     <contour>
-      <point x="278" y="18" type="line"/>
-      <point x="106" y="357" type="line"/>
-      <point x="277" y="674" type="line"/>
-      <point x="448" y="356" type="line"/>
+      <point x="267" y="18" type="line"/>
+      <point x="95" y="357" type="line"/>
+      <point x="266" y="674" type="line"/>
+      <point x="437" y="356" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/macron.glif b/src/Cantarell-Light.ufo/glyphs/macron.glif
index e14b2e0f..62365e59 100644
--- a/src/Cantarell-Light.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="475"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-12"/>
+    <component base="macroncomb" xOffset="8"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/minute.glif b/src/Cantarell-Light.ufo/glyphs/minute.glif
index 8505f46f..1d427430 100644
--- a/src/Cantarell-Light.ufo/glyphs/minute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/minute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="minute" format="2">
-  <advance width="340"/>
+  <advance width="298"/>
   <unicode hex="2032"/>
   <note>
 minute
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-55"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/numero.glif b/src/Cantarell-Light.ufo/glyphs/numero.glif
index e3739c27..948b3834 100644
--- a/src/Cantarell-Light.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/numero.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1216"/>
+  <advance width="1210"/>
   <unicode hex="2116"/>
   <outline>
     <component base="N"/>
-    <component base="ordmasculine" xOffset="758"/>
+    <component base="ordmasculine" xOffset="752"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/o-cy.glif b/src/Cantarell-Light.ufo/glyphs/o-cy.glif
index 6cdc429f..a0ccb722 100644
--- a/src/Cantarell-Light.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/o-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="o-cy" format="2">
   <advance width="557"/>
   <unicode hex="043E"/>
-  <anchor x="268" y="480" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
index 58a291e8..cc88b69b 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="49"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ogonek.glif b/src/Cantarell-Light.ufo/glyphs/ogonek.glif
index 401eb8b9..a7195add 100644
--- a/src/Cantarell-Light.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-74"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
index 99215010..94552944 100644
--- a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="267"/>
+  <advance width="261"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/paragraph.glif b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
index 268aaaa7..80d6be53 100644
--- a/src/Cantarell-Light.ufo/glyphs/paragraph.glif
+++ b/src/Cantarell-Light.ufo/glyphs/paragraph.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="paragraph" format="2">
-  <advance width="630"/>
+  <advance width="625"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="282" y="-162" type="line"/>
-      <point x="301" y="-162" type="line"/>
-      <point x="301" y="677" type="line"/>
-      <point x="488" y="677" type="line"/>
-      <point x="488" y="-162" type="line"/>
-      <point x="507" y="-162" type="line"/>
-      <point x="507" y="694" type="line"/>
-      <point x="282" y="694" type="line" smooth="yes"/>
-      <point x="151" y="694"/>
-      <point x="63" y="615"/>
-      <point x="63" y="497" type="curve" smooth="yes"/>
-      <point x="63" y="375"/>
-      <point x="151" y="293"/>
-      <point x="282" y="293" type="curve"/>
+      <point x="280" y="-162" type="line"/>
+      <point x="299" y="-162" type="line"/>
+      <point x="299" y="677" type="line"/>
+      <point x="486" y="677" type="line"/>
+      <point x="486" y="-162" type="line"/>
+      <point x="505" y="-162" type="line"/>
+      <point x="505" y="694" type="line"/>
+      <point x="280" y="694" type="line" smooth="yes"/>
+      <point x="149" y="694"/>
+      <point x="61" y="615"/>
+      <point x="61" y="497" type="curve" smooth="yes"/>
+      <point x="61" y="375"/>
+      <point x="149" y="293"/>
+      <point x="280" y="293" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
index 763f5f88..2a553a9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
+++ b/src/Cantarell-Light.ufo/glyphs/partialdiff.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="partialdiff" format="2">
-  <advance width="661"/>
+  <advance width="623"/>
   <unicode hex="2202"/>
   <outline>
     <contour>
-      <point x="298" y="-12" type="curve" smooth="yes"/>
-      <point x="445" y="-12"/>
-      <point x="537" y="133"/>
-      <point x="537" y="366" type="curve" smooth="yes"/>
-      <point x="537" y="582"/>
-      <point x="459" y="698"/>
-      <point x="318" y="698" type="curve" smooth="yes"/>
-      <point x="264" y="698"/>
-      <point x="206" y="681"/>
-      <point x="162" y="653" type="curve"/>
-      <point x="167" y="637" type="line"/>
-      <point x="210" y="664"/>
-      <point x="266" y="680"/>
-      <point x="316" y="680" type="curve" smooth="yes"/>
-      <point x="447" y="680"/>
-      <point x="517" y="572"/>
-      <point x="517" y="366" type="curve" smooth="yes"/>
-      <point x="517" y="143"/>
-      <point x="435" y="6"/>
-      <point x="301" y="6" type="curve" smooth="yes"/>
-      <point x="197" y="6"/>
-      <point x="124" y="88"/>
-      <point x="124" y="204" type="curve" smooth="yes"/>
-      <point x="124" y="323"/>
-      <point x="201" y="401"/>
-      <point x="319" y="401" type="curve" smooth="yes"/>
-      <point x="416" y="401"/>
-      <point x="491" y="347"/>
-      <point x="520" y="257" type="curve"/>
-      <point x="523" y="292" type="line"/>
-      <point x="491" y="372"/>
-      <point x="415" y="419"/>
-      <point x="321" y="419" type="curve" smooth="yes"/>
-      <point x="190" y="419"/>
-      <point x="103" y="332"/>
-      <point x="103" y="202" type="curve" smooth="yes"/>
-      <point x="103" y="76"/>
-      <point x="183" y="-12"/>
+      <point x="280" y="-12" type="curve" smooth="yes"/>
+      <point x="427" y="-12"/>
+      <point x="519" y="133"/>
+      <point x="519" y="366" type="curve" smooth="yes"/>
+      <point x="519" y="582"/>
+      <point x="441" y="698"/>
+      <point x="300" y="698" type="curve" smooth="yes"/>
+      <point x="246" y="698"/>
+      <point x="188" y="681"/>
+      <point x="144" y="653" type="curve"/>
+      <point x="149" y="637" type="line"/>
+      <point x="192" y="664"/>
+      <point x="248" y="680"/>
+      <point x="298" y="680" type="curve" smooth="yes"/>
+      <point x="429" y="680"/>
+      <point x="499" y="572"/>
+      <point x="499" y="366" type="curve" smooth="yes"/>
+      <point x="499" y="143"/>
+      <point x="417" y="6"/>
+      <point x="283" y="6" type="curve" smooth="yes"/>
+      <point x="179" y="6"/>
+      <point x="106" y="88"/>
+      <point x="106" y="204" type="curve" smooth="yes"/>
+      <point x="106" y="323"/>
+      <point x="183" y="401"/>
+      <point x="301" y="401" type="curve" smooth="yes"/>
+      <point x="398" y="401"/>
+      <point x="473" y="347"/>
+      <point x="502" y="257" type="curve"/>
+      <point x="505" y="292" type="line"/>
+      <point x="473" y="372"/>
+      <point x="397" y="419"/>
+      <point x="303" y="419" type="curve" smooth="yes"/>
+      <point x="172" y="419"/>
+      <point x="85" y="332"/>
+      <point x="85" y="202" type="curve" smooth="yes"/>
+      <point x="85" y="76"/>
+      <point x="165" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/percent.glif b/src/Cantarell-Light.ufo/glyphs/percent.glif
index b371a42e..f51c8abf 100644
--- a/src/Cantarell-Light.ufo/glyphs/percent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/percent.glif
@@ -1,69 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="percent" format="2">
-  <advance width="964"/>
+  <advance width="944"/>
   <unicode hex="0025"/>
   <outline>
     <contour>
-      <point x="291" y="0" type="line"/>
-      <point x="307" y="0" type="line"/>
-      <point x="693" y="694" type="line"/>
-      <point x="670" y="694" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="297" y="0" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="264" type="curve" smooth="yes"/>
-      <point x="321" y="264"/>
-      <point x="376" y="351"/>
-      <point x="376" y="484" type="curve" smooth="yes"/>
-      <point x="376" y="616"/>
-      <point x="322" y="704"/>
-      <point x="240" y="704" type="curve" smooth="yes"/>
-      <point x="155" y="704"/>
-      <point x="100" y="616"/>
-      <point x="100" y="481" type="curve" smooth="yes"/>
-      <point x="100" y="350"/>
-      <point x="154" y="264"/>
+      <point x="227" y="264" type="curve" smooth="yes"/>
+      <point x="311" y="264"/>
+      <point x="366" y="351"/>
+      <point x="366" y="484" type="curve" smooth="yes"/>
+      <point x="366" y="616"/>
+      <point x="312" y="704"/>
+      <point x="230" y="704" type="curve" smooth="yes"/>
+      <point x="145" y="704"/>
+      <point x="90" y="616"/>
+      <point x="90" y="481" type="curve" smooth="yes"/>
+      <point x="90" y="350"/>
+      <point x="144" y="264"/>
     </contour>
     <contour>
-      <point x="240" y="280" type="curve" smooth="yes"/>
-      <point x="167" y="280"/>
-      <point x="119" y="361"/>
-      <point x="119" y="484" type="curve" smooth="yes"/>
-      <point x="119" y="607"/>
-      <point x="166" y="688"/>
-      <point x="238" y="688" type="curve" smooth="yes"/>
-      <point x="310" y="688"/>
-      <point x="357" y="605"/>
-      <point x="357" y="481" type="curve" smooth="yes"/>
-      <point x="357" y="360"/>
-      <point x="310" y="280"/>
+      <point x="230" y="280" type="curve" smooth="yes"/>
+      <point x="157" y="280"/>
+      <point x="109" y="361"/>
+      <point x="109" y="484" type="curve" smooth="yes"/>
+      <point x="109" y="607"/>
+      <point x="156" y="688"/>
+      <point x="228" y="688" type="curve" smooth="yes"/>
+      <point x="300" y="688"/>
+      <point x="347" y="605"/>
+      <point x="347" y="481" type="curve" smooth="yes"/>
+      <point x="347" y="360"/>
+      <point x="300" y="280"/>
     </contour>
     <contour>
-      <point x="725" y="-6" type="curve" smooth="yes"/>
-      <point x="809" y="-6"/>
-      <point x="864" y="81"/>
-      <point x="864" y="214" type="curve" smooth="yes"/>
-      <point x="864" y="346"/>
-      <point x="810" y="434"/>
-      <point x="728" y="434" type="curve" smooth="yes"/>
-      <point x="643" y="434"/>
-      <point x="588" y="346"/>
-      <point x="588" y="211" type="curve" smooth="yes"/>
-      <point x="588" y="80"/>
-      <point x="642" y="-6"/>
+      <point x="715" y="-6" type="curve" smooth="yes"/>
+      <point x="799" y="-6"/>
+      <point x="854" y="81"/>
+      <point x="854" y="214" type="curve" smooth="yes"/>
+      <point x="854" y="346"/>
+      <point x="800" y="434"/>
+      <point x="718" y="434" type="curve" smooth="yes"/>
+      <point x="633" y="434"/>
+      <point x="578" y="346"/>
+      <point x="578" y="211" type="curve" smooth="yes"/>
+      <point x="578" y="80"/>
+      <point x="632" y="-6"/>
     </contour>
     <contour>
-      <point x="728" y="10" type="curve" smooth="yes"/>
-      <point x="655" y="10"/>
-      <point x="607" y="91"/>
-      <point x="607" y="214" type="curve" smooth="yes"/>
-      <point x="607" y="337"/>
-      <point x="654" y="418"/>
-      <point x="726" y="418" type="curve" smooth="yes"/>
-      <point x="798" y="418"/>
-      <point x="845" y="335"/>
-      <point x="845" y="211" type="curve" smooth="yes"/>
-      <point x="845" y="90"/>
-      <point x="798" y="10"/>
+      <point x="718" y="10" type="curve" smooth="yes"/>
+      <point x="645" y="10"/>
+      <point x="597" y="91"/>
+      <point x="597" y="214" type="curve" smooth="yes"/>
+      <point x="597" y="337"/>
+      <point x="644" y="418"/>
+      <point x="716" y="418" type="curve" smooth="yes"/>
+      <point x="788" y="418"/>
+      <point x="835" y="335"/>
+      <point x="835" y="211" type="curve" smooth="yes"/>
+      <point x="835" y="90"/>
+      <point x="788" y="10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
index d7e5bc67..6115049e 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
@@ -2,6 +2,6 @@
 <glyph name="periodcentered.loclCAT.case" format="2">
   <anchor x="0" y="352" name="_periodcentered"/>
   <outline>
-    <component base="period" xOffset="-241" yOffset="338"/>
+    <component base="period" xOffset="-236" yOffset="338"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
index 28dc0f54..425e4633 100644
--- a/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/periodcentered.loclC_A_T_.glif
@@ -3,18 +3,18 @@
   <anchor x="0" y="353" name="_periodcentered"/>
   <outline>
     <contour>
-      <point x="-17" y="331" type="curve" smooth="yes"/>
-      <point x="-3" y="331"/>
-      <point x="6" y="341"/>
-      <point x="6" y="354" type="curve" smooth="yes"/>
-      <point x="6" y="368"/>
-      <point x="-3" y="378"/>
-      <point x="-17" y="378" type="curve" smooth="yes"/>
-      <point x="-31" y="378"/>
-      <point x="-40" y="368"/>
-      <point x="-40" y="354" type="curve" smooth="yes"/>
-      <point x="-40" y="341"/>
-      <point x="-31" y="331"/>
+      <point x="5" y="331" type="curve" smooth="yes"/>
+      <point x="19" y="331"/>
+      <point x="28" y="341"/>
+      <point x="28" y="354" type="curve" smooth="yes"/>
+      <point x="28" y="368"/>
+      <point x="19" y="378"/>
+      <point x="5" y="378" type="curve" smooth="yes"/>
+      <point x="-9" y="378"/>
+      <point x="-18" y="368"/>
+      <point x="-18" y="354" type="curve" smooth="yes"/>
+      <point x="-18" y="341"/>
+      <point x="-9" y="331"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/perthousand.glif b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
index d1db595e..06890e3c 100644
--- a/src/Cantarell-Light.ufo/glyphs/perthousand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/perthousand.glif
@@ -1,69 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perthousand" format="2">
-  <advance width="1297"/>
+  <advance width="1287"/>
   <unicode hex="2030"/>
   <outline>
     <contour>
-      <point x="291" y="0" type="line"/>
-      <point x="307" y="0" type="line"/>
-      <point x="693" y="694" type="line"/>
-      <point x="670" y="694" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="297" y="0" type="line"/>
+      <point x="683" y="694" type="line"/>
+      <point x="660" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="237" y="264" type="curve" smooth="yes"/>
-      <point x="321" y="264"/>
-      <point x="376" y="351"/>
-      <point x="376" y="484" type="curve" smooth="yes"/>
-      <point x="376" y="616"/>
-      <point x="322" y="704"/>
-      <point x="240" y="704" type="curve" smooth="yes"/>
-      <point x="155" y="704"/>
-      <point x="100" y="616"/>
-      <point x="100" y="481" type="curve" smooth="yes"/>
-      <point x="100" y="350"/>
-      <point x="154" y="264"/>
+      <point x="227" y="264" type="curve" smooth="yes"/>
+      <point x="311" y="264"/>
+      <point x="366" y="351"/>
+      <point x="366" y="484" type="curve" smooth="yes"/>
+      <point x="366" y="616"/>
+      <point x="312" y="704"/>
+      <point x="230" y="704" type="curve" smooth="yes"/>
+      <point x="145" y="704"/>
+      <point x="90" y="616"/>
+      <point x="90" y="481" type="curve" smooth="yes"/>
+      <point x="90" y="350"/>
+      <point x="144" y="264"/>
     </contour>
     <contour>
-      <point x="240" y="280" type="curve" smooth="yes"/>
-      <point x="167" y="280"/>
-      <point x="119" y="361"/>
-      <point x="119" y="484" type="curve" smooth="yes"/>
-      <point x="119" y="607"/>
-      <point x="166" y="688"/>
-      <point x="238" y="688" type="curve" smooth="yes"/>
-      <point x="310" y="688"/>
-      <point x="357" y="605"/>
-      <point x="357" y="481" type="curve" smooth="yes"/>
-      <point x="357" y="360"/>
-      <point x="310" y="280"/>
+      <point x="230" y="280" type="curve" smooth="yes"/>
+      <point x="157" y="280"/>
+      <point x="109" y="361"/>
+      <point x="109" y="484" type="curve" smooth="yes"/>
+      <point x="109" y="607"/>
+      <point x="156" y="688"/>
+      <point x="228" y="688" type="curve" smooth="yes"/>
+      <point x="300" y="688"/>
+      <point x="347" y="605"/>
+      <point x="347" y="481" type="curve" smooth="yes"/>
+      <point x="347" y="360"/>
+      <point x="300" y="280"/>
     </contour>
     <contour>
-      <point x="725" y="-6" type="curve" smooth="yes"/>
-      <point x="809" y="-6"/>
-      <point x="864" y="81"/>
-      <point x="864" y="214" type="curve" smooth="yes"/>
-      <point x="864" y="346"/>
-      <point x="810" y="434"/>
-      <point x="728" y="434" type="curve" smooth="yes"/>
-      <point x="643" y="434"/>
-      <point x="588" y="346"/>
-      <point x="588" y="211" type="curve" smooth="yes"/>
-      <point x="588" y="80"/>
-      <point x="642" y="-6"/>
+      <point x="715" y="-6" type="curve" smooth="yes"/>
+      <point x="799" y="-6"/>
+      <point x="854" y="81"/>
+      <point x="854" y="214" type="curve" smooth="yes"/>
+      <point x="854" y="346"/>
+      <point x="800" y="434"/>
+      <point x="718" y="434" type="curve" smooth="yes"/>
+      <point x="633" y="434"/>
+      <point x="578" y="346"/>
+      <point x="578" y="211" type="curve" smooth="yes"/>
+      <point x="578" y="80"/>
+      <point x="632" y="-6"/>
     </contour>
     <contour>
-      <point x="728" y="10" type="curve" smooth="yes"/>
-      <point x="655" y="10"/>
-      <point x="607" y="91"/>
-      <point x="607" y="214" type="curve" smooth="yes"/>
-      <point x="607" y="337"/>
-      <point x="654" y="418"/>
-      <point x="726" y="418" type="curve" smooth="yes"/>
-      <point x="798" y="418"/>
-      <point x="845" y="335"/>
-      <point x="845" y="211" type="curve" smooth="yes"/>
-      <point x="845" y="90"/>
-      <point x="798" y="10"/>
+      <point x="718" y="10" type="curve" smooth="yes"/>
+      <point x="645" y="10"/>
+      <point x="597" y="91"/>
+      <point x="597" y="214" type="curve" smooth="yes"/>
+      <point x="597" y="337"/>
+      <point x="644" y="418"/>
+      <point x="716" y="418" type="curve" smooth="yes"/>
+      <point x="788" y="418"/>
+      <point x="835" y="335"/>
+      <point x="835" y="211" type="curve" smooth="yes"/>
+      <point x="835" y="90"/>
+      <point x="788" y="10"/>
     </contour>
     <contour>
       <point x="1058" y="-6" type="curve" smooth="yes"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/primemod.glif b/src/Cantarell-Light.ufo/glyphs/primemod.glif
index 847c5162..d9edae77 100644
--- a/src/Cantarell-Light.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="321"/>
+  <advance width="146"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/product.glif b/src/Cantarell-Light.ufo/glyphs/product.glif
index 2c32b42e..d699e049 100644
--- a/src/Cantarell-Light.ufo/glyphs/product.glif
+++ b/src/Cantarell-Light.ufo/glyphs/product.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="product" format="2">
-  <advance width="720"/>
+  <advance width="714"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="123" y="-95" type="line"/>
-      <point x="143" y="-95" type="line"/>
-      <point x="143" y="676" type="line"/>
-      <point x="577" y="676" type="line"/>
-      <point x="577" y="-95" type="line"/>
-      <point x="597" y="-95" type="line"/>
-      <point x="597" y="694" type="line"/>
-      <point x="123" y="694" type="line"/>
+      <point x="120" y="-95" type="line"/>
+      <point x="140" y="-95" type="line"/>
+      <point x="140" y="676" type="line"/>
+      <point x="574" y="676" type="line"/>
+      <point x="574" y="-95" type="line"/>
+      <point x="594" y="-95" type="line"/>
+      <point x="594" y="694" type="line"/>
+      <point x="120" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/radical.glif b/src/Cantarell-Light.ufo/glyphs/radical.glif
index 19791145..69df88b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/radical.glif
+++ b/src/Cantarell-Light.ufo/glyphs/radical.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="radical" format="2">
-  <advance width="590"/>
+  <advance width="547"/>
   <unicode hex="221A"/>
   <outline>
     <contour>
-      <point x="341" y="-59" type="line"/>
-      <point x="360" y="-59" type="line"/>
-      <point x="501" y="739" type="line"/>
-      <point x="480" y="739" type="line"/>
-      <point x="348" y="-27" type="line"/>
-      <point x="228" y="276" type="line"/>
-      <point x="76" y="276" type="line"/>
-      <point x="76" y="259" type="line"/>
-      <point x="214" y="259" type="line"/>
+      <point x="311" y="-59" type="line"/>
+      <point x="330" y="-59" type="line"/>
+      <point x="471" y="739" type="line"/>
+      <point x="450" y="739" type="line"/>
+      <point x="318" y="-27" type="line"/>
+      <point x="198" y="276" type="line"/>
+      <point x="46" y="276" type="line"/>
+      <point x="46" y="259" type="line"/>
+      <point x="184" y="259" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/registered.glif b/src/Cantarell-Light.ufo/glyphs/registered.glif
index 43049683..187d4f25 100644
--- a/src/Cantarell-Light.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/registered.glif
@@ -1,67 +1,67 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="registered" format="2">
-  <advance width="675"/>
+  <advance width="661"/>
   <unicode hex="00AE"/>
   <outline>
     <contour>
-      <point x="336" y="279" type="curve" smooth="yes"/>
-      <point x="473" y="279"/>
-      <point x="565" y="373"/>
-      <point x="565" y="514" type="curve" smooth="yes"/>
-      <point x="565" y="655"/>
-      <point x="474" y="749"/>
-      <point x="338" y="749" type="curve" smooth="yes"/>
-      <point x="201" y="749"/>
-      <point x="110" y="654"/>
-      <point x="110" y="512" type="curve" smooth="yes"/>
-      <point x="110" y="372"/>
-      <point x="200" y="279"/>
+      <point x="329" y="279" type="curve" smooth="yes"/>
+      <point x="466" y="279"/>
+      <point x="558" y="373"/>
+      <point x="558" y="514" type="curve" smooth="yes"/>
+      <point x="558" y="655"/>
+      <point x="467" y="749"/>
+      <point x="331" y="749" type="curve" smooth="yes"/>
+      <point x="194" y="749"/>
+      <point x="103" y="654"/>
+      <point x="103" y="512" type="curve" smooth="yes"/>
+      <point x="103" y="372"/>
+      <point x="193" y="279"/>
     </contour>
     <contour>
-      <point x="258" y="380" type="line"/>
-      <point x="279" y="380" type="line"/>
-      <point x="279" y="658" type="line"/>
-      <point x="258" y="658" type="line"/>
+      <point x="251" y="380" type="line"/>
+      <point x="272" y="380" type="line"/>
+      <point x="272" y="658" type="line"/>
+      <point x="251" y="658" type="line"/>
     </contour>
     <contour>
-      <point x="422" y="380" type="line"/>
-      <point x="447" y="380" type="line"/>
-      <point x="372" y="509" type="line"/>
-      <point x="348" y="509" type="line"/>
+      <point x="415" y="380" type="line"/>
+      <point x="440" y="380" type="line"/>
+      <point x="365" y="509" type="line"/>
+      <point x="341" y="509" type="line"/>
     </contour>
     <contour>
-      <point x="339" y="297" type="curve" smooth="yes"/>
-      <point x="214" y="297"/>
-      <point x="131" y="384"/>
-      <point x="131" y="515" type="curve" smooth="yes"/>
-      <point x="131" y="645"/>
-      <point x="213" y="731"/>
-      <point x="335" y="731" type="curve" smooth="yes"/>
-      <point x="460" y="731"/>
-      <point x="544" y="643"/>
-      <point x="544" y="511" type="curve" smooth="yes"/>
-      <point x="544" y="383"/>
-      <point x="462" y="297"/>
+      <point x="332" y="297" type="curve" smooth="yes"/>
+      <point x="207" y="297"/>
+      <point x="124" y="384"/>
+      <point x="124" y="515" type="curve" smooth="yes"/>
+      <point x="124" y="645"/>
+      <point x="206" y="731"/>
+      <point x="328" y="731" type="curve" smooth="yes"/>
+      <point x="453" y="731"/>
+      <point x="537" y="643"/>
+      <point x="537" y="511" type="curve" smooth="yes"/>
+      <point x="537" y="383"/>
+      <point x="455" y="297"/>
     </contour>
     <contour>
-      <point x="271" y="497" type="line"/>
-      <point x="337" y="497" type="line" smooth="yes"/>
-      <point x="396" y="497"/>
-      <point x="432" y="528"/>
-      <point x="432" y="580" type="curve" smooth="yes"/>
-      <point x="432" y="628"/>
-      <point x="398" y="658"/>
-      <point x="340" y="658" type="curve" smooth="yes"/>
-      <point x="271" y="658" type="line"/>
-      <point x="271" y="640" type="line"/>
-      <point x="337" y="640" type="line" smooth="yes"/>
-      <point x="385" y="640"/>
-      <point x="411" y="617"/>
-      <point x="411" y="576" type="curve" smooth="yes"/>
-      <point x="411" y="537"/>
-      <point x="386" y="514"/>
-      <point x="340" y="514" type="curve" smooth="yes"/>
-      <point x="271" y="514" type="line"/>
+      <point x="264" y="497" type="line"/>
+      <point x="330" y="497" type="line" smooth="yes"/>
+      <point x="389" y="497"/>
+      <point x="425" y="528"/>
+      <point x="425" y="580" type="curve" smooth="yes"/>
+      <point x="425" y="628"/>
+      <point x="391" y="658"/>
+      <point x="333" y="658" type="curve" smooth="yes"/>
+      <point x="264" y="658" type="line"/>
+      <point x="264" y="640" type="line"/>
+      <point x="330" y="640" type="line" smooth="yes"/>
+      <point x="378" y="640"/>
+      <point x="404" y="617"/>
+      <point x="404" y="576" type="curve" smooth="yes"/>
+      <point x="404" y="537"/>
+      <point x="379" y="514"/>
+      <point x="333" y="514" type="curve" smooth="yes"/>
+      <point x="264" y="514" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
index 554b1e6d..c5399fd2 100644
--- a/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rightA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rightArrow" format="2">
-  <advance width="694"/>
+  <advance width="664"/>
   <unicode hex="2192"/>
   <note>
 arrowright
 </note>
   <outline>
     <contour>
-      <point x="364" y="88" type="line"/>
-      <point x="610" y="330" type="line"/>
-      <point x="610" y="334" type="line"/>
-      <point x="366" y="571" type="line"/>
-      <point x="354" y="557" type="line"/>
-      <point x="576" y="340" type="line"/>
-      <point x="86" y="340" type="line"/>
-      <point x="86" y="323" type="line"/>
-      <point x="576" y="323" type="line"/>
-      <point x="352" y="101" type="line"/>
+      <point x="349" y="88" type="line"/>
+      <point x="595" y="330" type="line"/>
+      <point x="595" y="334" type="line"/>
+      <point x="351" y="571" type="line"/>
+      <point x="339" y="557" type="line"/>
+      <point x="561" y="340" type="line"/>
+      <point x="71" y="340" type="line"/>
+      <point x="71" y="323" type="line"/>
+      <point x="561" y="323" type="line"/>
+      <point x="337" y="101" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ring.glif b/src/Cantarell-Light.ufo/glyphs/ring.glif
index be09ba8b..8d239714 100644
--- a/src/Cantarell-Light.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="347"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb" xOffset="-1"/>
+    <component base="ringcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif 
b/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
index 7ea559cc..44a7464b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="251"/>
+  <advance width="175"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="251"/>
+    <component base="ringhalfright" xScale="-1" xOffset="175"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
index 469c33cb..bb9af36e 100644
--- a/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="251"/>
+  <advance width="175"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="70" y="576" type="line"/>
-      <point x="129" y="576"/>
-      <point x="164" y="608"/>
-      <point x="164" y="663" type="curve" smooth="yes"/>
-      <point x="164" y="713"/>
-      <point x="129" y="743"/>
-      <point x="70" y="743" type="curve"/>
-      <point x="70" y="729" type="line"/>
-      <point x="117" y="729"/>
-      <point x="144" y="704"/>
-      <point x="144" y="660" type="curve" smooth="yes"/>
-      <point x="144" y="615"/>
-      <point x="116" y="589"/>
-      <point x="70" y="589" type="curve"/>
+      <point x="32" y="576" type="line"/>
+      <point x="91" y="576"/>
+      <point x="126" y="608"/>
+      <point x="126" y="663" type="curve" smooth="yes"/>
+      <point x="126" y="713"/>
+      <point x="91" y="743"/>
+      <point x="32" y="743" type="curve"/>
+      <point x="32" y="729" type="line"/>
+      <point x="79" y="729"/>
+      <point x="106" y="704"/>
+      <point x="106" y="660" type="curve" smooth="yes"/>
+      <point x="106" y="615"/>
+      <point x="78" y="589"/>
+      <point x="32" y="589" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/second.glif b/src/Cantarell-Light.ufo/glyphs/second.glif
index 01ea9170..461872d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/second.glif
+++ b/src/Cantarell-Light.ufo/glyphs/second.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="second" format="2">
-  <advance width="520"/>
+  <advance width="478"/>
   <unicode hex="2033"/>
   <note>
 second
 </note>
   <outline>
-    <component base="quotesingle" yxScale="0.19201" xOffset="-55"/>
-    <component base="quotesingle" yxScale="0.19201" xOffset="125"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="-76"/>
+    <component base="quotesingle" yxScale="0.19201" xOffset="104"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
index 96755e9f..dc284c5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Light.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="242"/>
+  <advance width="150"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/section.glif b/src/Cantarell-Light.ufo/glyphs/section.glif
index 5bf3822c..8a712af1 100644
--- a/src/Cantarell-Light.ufo/glyphs/section.glif
+++ b/src/Cantarell-Light.ufo/glyphs/section.glif
@@ -1,63 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="section" format="2">
-  <advance width="581"/>
+  <advance width="542"/>
   <unicode hex="00A7"/>
   <outline>
     <contour>
-      <point x="300" y="-60" type="curve" smooth="yes"/>
-      <point x="399" y="-60"/>
-      <point x="465" y="-12"/>
-      <point x="465" y="71" type="curve" smooth="yes"/>
-      <point x="465" y="257"/>
-      <point x="143" y="174"/>
-      <point x="143" y="333" type="curve" smooth="yes"/>
-      <point x="143" y="399"/>
-      <point x="200" y="444"/>
-      <point x="296" y="444" type="curve"/>
-      <point x="297" y="457" type="line"/>
-      <point x="188" y="457"/>
-      <point x="122" y="408"/>
-      <point x="122" y="330" type="curve" smooth="yes"/>
-      <point x="122" y="156"/>
-      <point x="444" y="238"/>
-      <point x="444" y="68" type="curve" smooth="yes"/>
-      <point x="444" y="-2"/>
-      <point x="388" y="-42"/>
-      <point x="302" y="-42" type="curve" smooth="yes"/>
-      <point x="243" y="-42"/>
-      <point x="180" y="-24"/>
-      <point x="124" y="4" type="curve"/>
-      <point x="117" y="-13" type="line"/>
-      <point x="171" y="-42"/>
-      <point x="240" y="-60"/>
+      <point x="281" y="-60" type="curve" smooth="yes"/>
+      <point x="380" y="-60"/>
+      <point x="446" y="-12"/>
+      <point x="446" y="71" type="curve" smooth="yes"/>
+      <point x="446" y="257"/>
+      <point x="124" y="174"/>
+      <point x="124" y="333" type="curve" smooth="yes"/>
+      <point x="124" y="399"/>
+      <point x="181" y="444"/>
+      <point x="277" y="444" type="curve"/>
+      <point x="278" y="457" type="line"/>
+      <point x="169" y="457"/>
+      <point x="103" y="408"/>
+      <point x="103" y="330" type="curve" smooth="yes"/>
+      <point x="103" y="156"/>
+      <point x="425" y="238"/>
+      <point x="425" y="68" type="curve" smooth="yes"/>
+      <point x="425" y="-2"/>
+      <point x="369" y="-42"/>
+      <point x="283" y="-42" type="curve" smooth="yes"/>
+      <point x="224" y="-42"/>
+      <point x="161" y="-24"/>
+      <point x="105" y="4" type="curve"/>
+      <point x="98" y="-13" type="line"/>
+      <point x="152" y="-42"/>
+      <point x="221" y="-60"/>
     </contour>
     <contour>
-      <point x="301" y="193" type="line"/>
-      <point x="399" y="193"/>
-      <point x="458" y="239"/>
-      <point x="458" y="316" type="curve" smooth="yes"/>
-      <point x="458" y="497"/>
-      <point x="145" y="421"/>
-      <point x="145" y="568" type="curve" smooth="yes"/>
-      <point x="145" y="634"/>
-      <point x="207" y="686"/>
-      <point x="298" y="686" type="curve" smooth="yes"/>
-      <point x="344" y="686"/>
-      <point x="396" y="673"/>
-      <point x="437" y="652" type="curve"/>
-      <point x="444" y="668" type="line"/>
-      <point x="401" y="691"/>
-      <point x="350" y="704"/>
-      <point x="301" y="704" type="curve" smooth="yes"/>
-      <point x="197" y="704"/>
-      <point x="124" y="646"/>
-      <point x="124" y="566" type="curve" smooth="yes"/>
-      <point x="124" y="402"/>
-      <point x="437" y="481"/>
-      <point x="437" y="315" type="curve" smooth="yes"/>
-      <point x="437" y="248"/>
-      <point x="387" y="206"/>
-      <point x="302" y="206" type="curve"/>
+      <point x="282" y="193" type="line"/>
+      <point x="380" y="193"/>
+      <point x="439" y="239"/>
+      <point x="439" y="316" type="curve" smooth="yes"/>
+      <point x="439" y="497"/>
+      <point x="126" y="421"/>
+      <point x="126" y="568" type="curve" smooth="yes"/>
+      <point x="126" y="634"/>
+      <point x="188" y="686"/>
+      <point x="279" y="686" type="curve" smooth="yes"/>
+      <point x="325" y="686"/>
+      <point x="377" y="673"/>
+      <point x="418" y="652" type="curve"/>
+      <point x="425" y="668" type="line"/>
+      <point x="382" y="691"/>
+      <point x="331" y="704"/>
+      <point x="282" y="704" type="curve" smooth="yes"/>
+      <point x="178" y="704"/>
+      <point x="105" y="646"/>
+      <point x="105" y="566" type="curve" smooth="yes"/>
+      <point x="105" y="402"/>
+      <point x="418" y="481"/>
+      <point x="418" y="315" type="curve" smooth="yes"/>
+      <point x="418" y="248"/>
+      <point x="368" y="206"/>
+      <point x="283" y="206" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/summation.glif b/src/Cantarell-Light.ufo/glyphs/summation.glif
index 61b116f1..939f9a77 100644
--- a/src/Cantarell-Light.ufo/glyphs/summation.glif
+++ b/src/Cantarell-Light.ufo/glyphs/summation.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="summation" format="2">
-  <advance width="645"/>
+  <advance width="616"/>
   <unicode hex="2211"/>
   <outline>
     <contour>
-      <point x="81" y="-95" type="line"/>
-      <point x="566" y="-95" type="line"/>
-      <point x="566" y="-78" type="line"/>
-      <point x="105" y="-78" type="line"/>
-      <point x="430" y="299" type="line"/>
-      <point x="108" y="675" type="line"/>
-      <point x="566" y="677" type="line"/>
-      <point x="566" y="694" type="line"/>
-      <point x="81" y="694" type="line"/>
-      <point x="81" y="680" type="line"/>
-      <point x="406" y="299" type="line"/>
-      <point x="81" y="-81" type="line"/>
+      <point x="66" y="-95" type="line"/>
+      <point x="551" y="-95" type="line"/>
+      <point x="551" y="-78" type="line"/>
+      <point x="90" y="-78" type="line"/>
+      <point x="415" y="299" type="line"/>
+      <point x="93" y="675" type="line"/>
+      <point x="551" y="677" type="line"/>
+      <point x="551" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
+      <point x="66" y="680" type="line"/>
+      <point x="391" y="299" type="line"/>
+      <point x="66" y="-81" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/te-cy.glif b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
index 05a38b70..da3576b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/te-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="te-cy" format="2">
   <advance width="443"/>
   <unicode hex="0442"/>
-  <anchor x="427" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="211" y="0" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.glif b/src/Cantarell-Light.ufo/glyphs/three.glif
index b8b4c3da..87f81e94 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="562"/>
+  <advance width="548"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="265" y="-10" type="curve" smooth="yes"/>
-      <point x="400" y="-10"/>
-      <point x="488" y="60"/>
-      <point x="488" y="172" type="curve" smooth="yes"/>
-      <point x="488" y="282"/>
-      <point x="402" y="352"/>
-      <point x="264" y="357" type="curve"/>
-      <point x="264" y="349" type="line"/>
-      <point x="379" y="356"/>
-      <point x="455" y="429"/>
-      <point x="455" y="529" type="curve" smooth="yes"/>
-      <point x="455" y="634"/>
-      <point x="374" y="704"/>
-      <point x="254" y="704" type="curve" smooth="yes"/>
-      <point x="190" y="704"/>
-      <point x="126" y="683"/>
-      <point x="74" y="645" type="curve"/>
-      <point x="79" y="629" type="line"/>
-      <point x="139" y="668"/>
-      <point x="193" y="686"/>
-      <point x="250" y="686" type="curve" smooth="yes"/>
-      <point x="360" y="686"/>
-      <point x="434" y="622"/>
-      <point x="434" y="527" type="curve" smooth="yes"/>
-      <point x="434" y="427"/>
-      <point x="353" y="361"/>
-      <point x="235" y="361" type="curve" smooth="yes"/>
-      <point x="187" y="361" type="line"/>
-      <point x="187" y="344" type="line"/>
-      <point x="245" y="344" type="line" smooth="yes"/>
-      <point x="381" y="344"/>
-      <point x="468" y="276"/>
-      <point x="468" y="170" type="curve" smooth="yes"/>
-      <point x="468" y="69"/>
-      <point x="390" y="9"/>
-      <point x="266" y="9" type="curve" smooth="yes"/>
-      <point x="196" y="9"/>
-      <point x="120" y="29"/>
-      <point x="60" y="63" type="curve"/>
-      <point x="55" y="45" type="line"/>
-      <point x="113" y="11"/>
-      <point x="192" y="-10"/>
+      <point x="254" y="-10" type="curve" smooth="yes"/>
+      <point x="389" y="-10"/>
+      <point x="477" y="60"/>
+      <point x="477" y="172" type="curve" smooth="yes"/>
+      <point x="477" y="282"/>
+      <point x="391" y="352"/>
+      <point x="253" y="357" type="curve"/>
+      <point x="253" y="349" type="line"/>
+      <point x="368" y="356"/>
+      <point x="444" y="429"/>
+      <point x="444" y="529" type="curve" smooth="yes"/>
+      <point x="444" y="634"/>
+      <point x="363" y="704"/>
+      <point x="243" y="704" type="curve" smooth="yes"/>
+      <point x="179" y="704"/>
+      <point x="115" y="683"/>
+      <point x="63" y="645" type="curve"/>
+      <point x="68" y="629" type="line"/>
+      <point x="128" y="668"/>
+      <point x="182" y="686"/>
+      <point x="239" y="686" type="curve" smooth="yes"/>
+      <point x="349" y="686"/>
+      <point x="423" y="622"/>
+      <point x="423" y="527" type="curve" smooth="yes"/>
+      <point x="423" y="427"/>
+      <point x="342" y="361"/>
+      <point x="224" y="361" type="curve" smooth="yes"/>
+      <point x="176" y="361" type="line"/>
+      <point x="176" y="344" type="line"/>
+      <point x="234" y="344" type="line" smooth="yes"/>
+      <point x="370" y="344"/>
+      <point x="457" y="276"/>
+      <point x="457" y="170" type="curve" smooth="yes"/>
+      <point x="457" y="69"/>
+      <point x="379" y="9"/>
+      <point x="255" y="9" type="curve" smooth="yes"/>
+      <point x="185" y="9"/>
+      <point x="109" y="29"/>
+      <point x="49" y="63" type="curve"/>
+      <point x="44" y="45" type="line"/>
+      <point x="102" y="11"/>
+      <point x="181" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/three.osf.glif b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
index c951b533..a1953adc 100644
--- a/src/Cantarell-Light.ufo/glyphs/three.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/three.osf.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three.osf" format="2">
-  <advance width="572"/>
+  <advance width="558"/>
   <outline>
     <contour>
-      <point x="270" y="-110" type="curve" smooth="yes"/>
-      <point x="409" y="-110"/>
-      <point x="498" y="-40"/>
-      <point x="498" y="70" type="curve" smooth="yes"/>
-      <point x="498" y="175"/>
-      <point x="418" y="240"/>
-      <point x="269" y="256" type="curve"/>
-      <point x="269" y="252" type="line"/>
-      <point x="384" y="259"/>
-      <point x="460" y="329"/>
-      <point x="460" y="428" type="curve" smooth="yes"/>
-      <point x="460" y="532"/>
-      <point x="378" y="604"/>
-      <point x="259" y="604" type="curve" smooth="yes"/>
-      <point x="193" y="604"/>
-      <point x="128" y="583"/>
-      <point x="74" y="545" type="curve"/>
-      <point x="79" y="529" type="line"/>
-      <point x="141" y="568"/>
-      <point x="197" y="586"/>
-      <point x="255" y="586" type="curve" smooth="yes"/>
-      <point x="365" y="586"/>
-      <point x="439" y="524"/>
-      <point x="439" y="424" type="curve" smooth="yes"/>
-      <point x="439" y="316"/>
-      <point x="355" y="261"/>
-      <point x="190" y="261" type="curve"/>
-      <point x="190" y="244" type="line"/>
-      <point x="375" y="244"/>
-      <point x="478" y="181"/>
-      <point x="478" y="68" type="curve" smooth="yes"/>
-      <point x="478" y="-31"/>
-      <point x="399" y="-91"/>
-      <point x="271" y="-91" type="curve" smooth="yes"/>
-      <point x="199" y="-91"/>
-      <point x="121" y="-71"/>
-      <point x="60" y="-37" type="curve"/>
-      <point x="55" y="-55" type="line"/>
-      <point x="114" y="-89"/>
-      <point x="195" y="-110"/>
+      <point x="259" y="-110" type="curve" smooth="yes"/>
+      <point x="398" y="-110"/>
+      <point x="487" y="-40"/>
+      <point x="487" y="70" type="curve" smooth="yes"/>
+      <point x="487" y="175"/>
+      <point x="407" y="240"/>
+      <point x="258" y="256" type="curve"/>
+      <point x="258" y="252" type="line"/>
+      <point x="373" y="259"/>
+      <point x="449" y="329"/>
+      <point x="449" y="428" type="curve" smooth="yes"/>
+      <point x="449" y="532"/>
+      <point x="367" y="604"/>
+      <point x="248" y="604" type="curve" smooth="yes"/>
+      <point x="182" y="604"/>
+      <point x="117" y="583"/>
+      <point x="63" y="545" type="curve"/>
+      <point x="68" y="529" type="line"/>
+      <point x="130" y="568"/>
+      <point x="186" y="586"/>
+      <point x="244" y="586" type="curve" smooth="yes"/>
+      <point x="354" y="586"/>
+      <point x="428" y="524"/>
+      <point x="428" y="424" type="curve" smooth="yes"/>
+      <point x="428" y="316"/>
+      <point x="344" y="261"/>
+      <point x="179" y="261" type="curve"/>
+      <point x="179" y="244" type="line"/>
+      <point x="364" y="244"/>
+      <point x="467" y="181"/>
+      <point x="467" y="68" type="curve" smooth="yes"/>
+      <point x="467" y="-31"/>
+      <point x="388" y="-91"/>
+      <point x="260" y="-91" type="curve" smooth="yes"/>
+      <point x="188" y="-91"/>
+      <point x="110" y="-71"/>
+      <point x="49" y="-37" type="curve"/>
+      <point x="44" y="-55" type="line"/>
+      <point x="103" y="-89"/>
+      <point x="184" y="-110"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/tilde.glif b/src/Cantarell-Light.ufo/glyphs/tilde.glif
index 1af6d334..c95faf79 100644
--- a/src/Cantarell-Light.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-18"/>
+    <component base="tildecomb" xOffset="12"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/trademark.glif b/src/Cantarell-Light.ufo/glyphs/trademark.glif
index db90b5d2..6e3da90e 100644
--- a/src/Cantarell-Light.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Light.ufo/glyphs/trademark.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="trademark" format="2">
-  <advance width="793"/>
+  <advance width="775"/>
   <unicode hex="2122"/>
   <outline>
     <contour>
-      <point x="359" y="382" type="line"/>
-      <point x="376" y="382" type="line"/>
-      <point x="376" y="674" type="line"/>
-      <point x="372" y="674" type="line"/>
-      <point x="499" y="431" type="line"/>
-      <point x="513" y="431" type="line"/>
-      <point x="636" y="674" type="line"/>
-      <point x="631" y="674" type="line"/>
-      <point x="631" y="382" type="line"/>
-      <point x="649" y="382" type="line"/>
-      <point x="649" y="694" type="line"/>
-      <point x="629" y="694" type="line"/>
-      <point x="504" y="446" type="line"/>
-      <point x="509" y="446" type="line"/>
-      <point x="380" y="694" type="line"/>
-      <point x="359" y="694" type="line"/>
+      <point x="346" y="382" type="line"/>
+      <point x="363" y="382" type="line"/>
+      <point x="363" y="674" type="line"/>
+      <point x="359" y="674" type="line"/>
+      <point x="486" y="431" type="line"/>
+      <point x="500" y="431" type="line"/>
+      <point x="623" y="674" type="line"/>
+      <point x="618" y="674" type="line"/>
+      <point x="618" y="382" type="line"/>
+      <point x="636" y="382" type="line"/>
+      <point x="636" y="694" type="line"/>
+      <point x="616" y="694" type="line"/>
+      <point x="491" y="446" type="line"/>
+      <point x="496" y="446" type="line"/>
+      <point x="367" y="694" type="line"/>
+      <point x="346" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="189" y="382" type="line"/>
-      <point x="207" y="382" type="line"/>
-      <point x="207" y="690" type="line"/>
-      <point x="189" y="690" type="line"/>
+      <point x="176" y="382" type="line"/>
+      <point x="194" y="382" type="line"/>
+      <point x="194" y="690" type="line"/>
+      <point x="176" y="690" type="line"/>
     </contour>
     <contour>
-      <point x="80" y="679" type="line"/>
-      <point x="316" y="679" type="line"/>
-      <point x="316" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
+      <point x="67" y="679" type="line"/>
+      <point x="303" y="679" type="line"/>
+      <point x="303" y="694" type="line"/>
+      <point x="67" y="694" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/u-cy.glif b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
index cc0b412e..77b2de34 100644
--- a/src/Cantarell-Light.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="u-cy" format="2">
   <advance width="463"/>
   <unicode hex="0443"/>
-  <anchor x="227" y="480" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
index c4677a18..68108733 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="8"/>
+    <component base="dieresiscomb" xOffset="1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
index 374242f7..ea3a3e7f 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="86"/>
+    <component base="hungarumlautcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
index ff490288..b0113baf 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="-16"/>
+    <component base="macroncomb" xOffset="-23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
index e18ebbdb..066d1d36 100644
--- a/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upA_rrow.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upArrow" format="2">
-  <advance width="646"/>
+  <advance width="616"/>
   <unicode hex="2191"/>
   <note>
 arrowup
 </note>
   <outline>
     <contour>
-      <point x="314" y="44" type="line"/>
-      <point x="333" y="44" type="line"/>
-      <point x="333" y="561" type="line"/>
-      <point x="550" y="326" type="line"/>
-      <point x="564" y="339" type="line"/>
-      <point x="325" y="598" type="line"/>
-      <point x="322" y="598" type="line"/>
-      <point x="82" y="337" type="line"/>
-      <point x="95" y="324" type="line"/>
-      <point x="314" y="562" type="line"/>
+      <point x="299" y="44" type="line"/>
+      <point x="318" y="44" type="line"/>
+      <point x="318" y="561" type="line"/>
+      <point x="535" y="326" type="line"/>
+      <point x="549" y="339" type="line"/>
+      <point x="310" y="598" type="line"/>
+      <point x="307" y="598" type="line"/>
+      <point x="67" y="337" type="line"/>
+      <point x="80" y="324" type="line"/>
+      <point x="299" y="562" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
index 01546ff4..06245e62 100644
--- a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="30"/>
+    <component base="brevecomb-cy" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
index a2b884d5..2f05d8c7 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="220"/>
+  <advance width="142"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
index 8cf16a09..1362999b 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="220"/>
+  <advance width="142"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.glif
index b1381db0..9807ecb6 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="601"/>
+  <advance width="600"/>
   <unicode hex="0030"/>
   <anchor x="309" y="350" name="slash"/>
   <outline>
     <contour>
-      <point x="300" y="-10" type="curve" smooth="yes"/>
-      <point x="431" y="-10"/>
-      <point x="518" y="131"/>
-      <point x="518" y="343" type="curve" smooth="yes"/>
-      <point x="518" y="556"/>
-      <point x="432" y="699"/>
+      <point x="299" y="-10" type="curve" smooth="yes"/>
+      <point x="432" y="-10"/>
+      <point x="520" y="132"/>
+      <point x="520" y="343" type="curve" smooth="yes"/>
+      <point x="520" y="556"/>
+      <point x="433" y="699"/>
       <point x="304" y="699" type="curve" smooth="yes"/>
-      <point x="171" y="699"/>
-      <point x="83" y="555"/>
-      <point x="83" y="340" type="curve" smooth="yes"/>
-      <point x="83" y="130"/>
-      <point x="170" y="-10"/>
+      <point x="169" y="699"/>
+      <point x="80" y="554"/>
+      <point x="80" y="340" type="curve" smooth="yes"/>
+      <point x="80" y="131"/>
+      <point x="168" y="-10"/>
     </contour>
     <contour>
       <point x="303" y="8" type="curve" smooth="yes"/>
-      <point x="184" y="8"/>
-      <point x="104" y="142"/>
-      <point x="104" y="343" type="curve" smooth="yes"/>
-      <point x="104" y="546"/>
-      <point x="183" y="681"/>
+      <point x="182" y="8"/>
+      <point x="101" y="143"/>
+      <point x="101" y="343" type="curve" smooth="yes"/>
+      <point x="101" y="545"/>
+      <point x="181" y="681"/>
       <point x="301" y="681" type="curve" smooth="yes"/>
-      <point x="419" y="681"/>
-      <point x="497" y="544"/>
-      <point x="497" y="340" type="curve" smooth="yes"/>
-      <point x="497" y="141"/>
-      <point x="419" y="8"/>
+      <point x="420" y="681"/>
+      <point x="499" y="544"/>
+      <point x="499" y="340" type="curve" smooth="yes"/>
+      <point x="499" y="142"/>
+      <point x="420" y="8"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
index c3afa1ca..632474c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf" format="2">
-  <advance width="601"/>
-  <anchor x="309" y="300" name="slash"/>
+  <advance width="595"/>
+  <anchor x="306" y="300" name="slash"/>
   <outline>
     <contour>
-      <point x="300" y="-9" type="curve" smooth="yes"/>
-      <point x="431" y="-9"/>
-      <point x="518" y="112"/>
-      <point x="518" y="294" type="curve" smooth="yes"/>
-      <point x="518" y="477"/>
-      <point x="432" y="599"/>
-      <point x="304" y="599" type="curve" smooth="yes"/>
-      <point x="171" y="599"/>
-      <point x="83" y="476"/>
-      <point x="83" y="291" type="curve" smooth="yes"/>
-      <point x="83" y="111"/>
-      <point x="170" y="-9"/>
+      <point x="297" y="-9" type="curve" smooth="yes"/>
+      <point x="428" y="-9"/>
+      <point x="515" y="112"/>
+      <point x="515" y="294" type="curve" smooth="yes"/>
+      <point x="515" y="477"/>
+      <point x="429" y="599"/>
+      <point x="301" y="599" type="curve" smooth="yes"/>
+      <point x="168" y="599"/>
+      <point x="80" y="476"/>
+      <point x="80" y="291" type="curve" smooth="yes"/>
+      <point x="80" y="111"/>
+      <point x="167" y="-9"/>
     </contour>
     <contour>
-      <point x="303" y="9" type="curve" smooth="yes"/>
-      <point x="184" y="9"/>
-      <point x="104" y="123"/>
-      <point x="104" y="294" type="curve" smooth="yes"/>
-      <point x="104" y="466"/>
-      <point x="183" y="581"/>
-      <point x="301" y="581" type="curve" smooth="yes"/>
-      <point x="419" y="581"/>
-      <point x="497" y="465"/>
-      <point x="497" y="291" type="curve" smooth="yes"/>
-      <point x="497" y="122"/>
-      <point x="419" y="9"/>
+      <point x="300" y="9" type="curve" smooth="yes"/>
+      <point x="181" y="9"/>
+      <point x="101" y="123"/>
+      <point x="101" y="294" type="curve" smooth="yes"/>
+      <point x="101" y="466"/>
+      <point x="180" y="581"/>
+      <point x="298" y="581" type="curve" smooth="yes"/>
+      <point x="416" y="581"/>
+      <point x="494" y="465"/>
+      <point x="494" y="291" type="curve" smooth="yes"/>
+      <point x="494" y="122"/>
+      <point x="416" y="9"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif 
b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
index 50d6f4b4..32f1a053 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.osf.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.osf.zero" format="2">
-  <advance width="601"/>
+  <advance width="595"/>
   <outline>
     <component base="zero.osf"/>
-    <component base="_slash.zero.osf" xOffset="86" yOffset="49"/>
+    <component base="_slash.zero.osf" xOffset="83" yOffset="49"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
index 6e4b9a66..c2d25d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zero.zero.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.zero" format="2">
-  <advance width="601"/>
+  <advance width="600"/>
   <outline>
     <component base="zero"/>
     <component base="_slash.zero" xOffset="86" yOffset="109"/>
diff --git a/src/Cantarell-Regular.ufo/features.fea b/src/Cantarell-Regular.ufo/features.fea
index 90a096d1..6cc69ea6 100644
--- a/src/Cantarell-Regular.ufo/features.fea
+++ b/src/Cantarell-Regular.ufo/features.fea
@@ -4,17 +4,17 @@
 # Prefix: Languagesystems
 # automatic
 languagesystem DFLT dflt;
+
 languagesystem latn dflt;
-languagesystem cyrl dflt;
-languagesystem latn NLD;
-languagesystem latn CAT;
 languagesystem latn ROM;
 languagesystem latn MOL;
 languagesystem latn KAZ;
+languagesystem latn TAT;
 languagesystem latn TRK;
 languagesystem latn CRT;
 languagesystem latn AZE;
-languagesystem cyrl TAT;
+languagesystem latn NLD;
+languagesystem latn CAT;
 
 
 # Prefix: GDEF
@@ -76,35 +76,39 @@ lookup ccmp_Other_3 {
 
 feature locl {
 # automatic
-script latn;
-language NLD;
-sub iacute j' by jacute;
-sub Iacute J' by Jacute;
-language CAT;
-sub l periodcentered' l by periodcentered.loclCAT;
-sub L periodcentered' L by periodcentered.loclCAT.case;
-language ROM;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language MOL;
-sub Scedilla by Scommaaccent;
-sub scedilla by scommaaccent;
-sub Tcedilla by Tcommaaccent;
-sub tcedilla by tcommaaccent;
-language KAZ;
-sub i by idotaccent;
-language TRK;
-sub i by idotaccent;
-language CRT;
-sub i by idotaccent;
-language AZE;
-sub i by idotaccent;
-
-script cyrl;
-language TAT;
-sub i by idotaccent;
+lookup locl_latn_0 {
+       script latn;
+       language ROM;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language MOL;
+       sub Scedilla by Scommaaccent;
+       sub scedilla by scommaaccent;
+       sub Tcedilla by Tcommaaccent;
+       sub tcedilla by tcommaaccent;
+       language KAZ;
+       sub i by idotaccent;
+       language TAT;
+       sub i by idotaccent;
+       language TRK;
+       sub i by idotaccent;
+       language CRT;
+       sub i by idotaccent;
+       language AZE;
+       sub i by idotaccent;
+} locl_latn_0;
+
+lookup locl_latn_1 {
+       script latn;
+       language NLD;
+       sub iacute j' by jacute;
+       sub Iacute J' by Jacute;
+       language CAT;
+       sub l periodcentered' l by periodcentered.loclCAT;
+       sub L periodcentered' L by periodcentered.loclCAT.case;
+} locl_latn_1;
 
 } locl;
 
@@ -296,6 +300,7 @@ sub descender-cy by descender-cy.case;
 
 feature liga {
 # automatic
+lookupflag IgnoreMarks;
 sub f i by fi;
 sub f l by fl;
 
@@ -303,9 +308,9 @@ sub f l by fl;
 
 feature zero {
 # automatic
+sub zero by zero.zero;
 sub zero.osf by zero.osf.zero;
 sub zero.tf by zero.tf.zero;
-sub zero by zero.zero;
 
 } zero;
 
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
index 1332f1d4..a1269a56 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_.glif b/src/Cantarell-Regular.ufo/glyphs/A_.glif
index a16a0797..d5a017f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0041"/>
   <note>
 A
@@ -26,4 +26,10 @@ A
       <point x="138" y="278" 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/A_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
index 8af30ee6..4e6bddf6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
index fc1fc2a0..3d1c33bf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
index 6ea7ece1..0ed05a90 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
index 89901f8e..b73b7a4c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
index e1bbfdd7..27f54623 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
index 499b440f..009f20ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
index 2981db70..d4f7ff05 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
index 905086b2..ca705bc9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
index 65c775bd..cf879171 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
index 530df057..3d3d84b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
index 999f73d8..f6a3b5c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
index 0373bfc5..65b095cc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
index 0396d91a..16351143 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
index f3317759..9ee610bb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
index 789d9680..a05cd19c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
index e345c140..49edff96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
index 21f155cf..83188b6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
index 585e2ac6..a8477069 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
index 1e6e186c..ce22b1c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
index 508d1dc9..46afbb5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
index d6f8617d..eaeb6375 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
index 209cec35..eea7eb08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
index 48516b34..5c57eaa6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
index c368f010..13c909d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
index ef196f34..d0913546 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
index 2df1e7cc..6ff232a8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
index 7fc14c9d..208825cd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="625"/>
+  <advance width="626"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
index 6898a7ee..70cea435 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_a-cy.glif
@@ -1,40 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="629"/>
+  <advance width="610"/>
   <unicode hex="042F"/>
-  <anchor x="315" y="694" name="top"/>
+  <anchor x="296" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="454" y="0" type="line"/>
-      <point x="537" y="0" type="line"/>
-      <point x="537" y="694" type="line"/>
-      <point x="292" y="694" type="line" smooth="yes"/>
-      <point x="155" y="694"/>
-      <point x="55" y="597"/>
-      <point x="55" y="465" type="curve" smooth="yes"/>
-      <point x="55" y="341"/>
-      <point x="146" y="260"/>
-      <point x="282" y="260" type="curve" smooth="yes"/>
-      <point x="484" y="260" type="line"/>
-      <point x="484" y="330" type="line"/>
-      <point x="292" y="330" type="line" smooth="yes"/>
-      <point x="202" y="330"/>
-      <point x="140" y="390"/>
-      <point x="140" y="480" type="curve" smooth="yes"/>
-      <point x="140" y="569"/>
-      <point x="195" y="622"/>
-      <point x="282" y="622" type="curve" smooth="yes"/>
-      <point x="454" y="622" type="line"/>
+      <point x="435" y="0" type="line"/>
+      <point x="518" y="0" type="line"/>
+      <point x="518" y="694" type="line"/>
+      <point x="273" y="694" type="line" smooth="yes"/>
+      <point x="136" y="694"/>
+      <point x="36" y="597"/>
+      <point x="36" y="465" type="curve" smooth="yes"/>
+      <point x="36" y="341"/>
+      <point x="127" y="260"/>
+      <point x="263" y="260" type="curve" smooth="yes"/>
+      <point x="465" y="260" type="line"/>
+      <point x="465" y="330" type="line"/>
+      <point x="273" y="330" type="line" smooth="yes"/>
+      <point x="183" y="330"/>
+      <point x="121" y="390"/>
+      <point x="121" y="480" type="curve" smooth="yes"/>
+      <point x="121" y="569"/>
+      <point x="176" y="622"/>
+      <point x="263" y="622" type="curve" smooth="yes"/>
+      <point x="435" y="622" type="line"/>
     </contour>
     <contour>
-      <point x="45" y="0" type="line"/>
-      <point x="144" y="0" type="line"/>
-      <point x="327" y="306" type="line"/>
-      <point x="233" y="306" type="line"/>
+      <point x="26" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="308" y="306" type="line"/>
+      <point x="214" y="306" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|R</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>I</string>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 0d803ed8..592bc545 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="Ie-cy" format="2">
   <advance width="584"/>
   <unicode hex="0415"/>
-  <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
index 6db7b418..b99a2c6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="brevecomb-cy.case" xOffset="88"/>
+    <component base="brevecomb-cy.case" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
index 1f296154..a3d40a88 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="gravecomb.case" xOffset="108"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
index 283e29d5..d30cc063 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
-    <component base="dieresiscomb.case" xOffset="67"/>
+    <component base="dieresiscomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
index 1d6a51e0..c8a73c3b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="O-cy" format="2">
   <advance width="760"/>
   <unicode hex="041E"/>
-  <anchor x="394" y="694" name="top"/>
   <outline>
     <component base="O"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
index 5d80ec53..6e8269b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
   </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 83c66459..0b22c63d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="Te-cy" format="2">
   <advance width="566"/>
   <unicode hex="0422"/>
-  <anchor x="614" y="0" name="bottomright"/>
   <outline>
     <component base="T"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
index d8953d55..a852d309 100644
--- a/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/a-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="a-cy" format="2">
   <advance width="512"/>
   <unicode hex="0430"/>
-  <anchor x="258" y="482" name="top"/>
   <outline>
     <component base="a"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
index aa3f92ed..1226e22b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/abreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
-    <component base="brevecomb-cy" xOffset="36"/>
+    <component base="brevecomb-cy" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acute.glif b/src/Cantarell-Regular.ufo/glyphs/acute.glif
index 1a1cc824..c46831d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acute.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acute" format="2">
-  <advance width="259"/>
+  <advance width="500"/>
   <unicode hex="00B4"/>
   <outline>
-    <component base="acutecomb" xOffset="-2"/>
+    <component base="acutecomb" xOffset="117"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
index 277bffa8..8607fa67 100644
--- a/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/adieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
-    <component base="dieresiscomb" xOffset="25"/>
+    <component base="dieresiscomb" xOffset="13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
index 616b280d..a7632828 100644
--- a/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/apostrophemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="apostrophemod" format="2">
-  <advance width="294"/>
+  <advance width="166"/>
   <unicode hex="02BC"/>
   <outline>
-    <component base="quoteright"/>
+    <component base="quoteright" xOffset="-30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/breve.glif b/src/Cantarell-Regular.ufo/glyphs/breve.glif
index 7fe2eeb3..b68d8c89 100644
--- a/src/Cantarell-Regular.ufo/glyphs/breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/breve.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="breve" format="2">
-  <advance width="410"/>
+  <advance width="500"/>
   <unicode hex="02D8"/>
   <outline>
-    <component base="brevecomb" xOffset="-2"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
index b4a2dfeb..f3a7103b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/brevecomb-cy.case.glif
@@ -3,7 +3,7 @@
   <anchor x="215" y="694" name="_top"/>
   <anchor x="215" y="892" name="top"/>
   <outline>
-    <component base="brevecomb-cy" yOffset="197"/>
+    <component base="brevecomb-cy" yOffset="187"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/caron.glif b/src/Cantarell-Regular.ufo/glyphs/caron.glif
index 7b738fcc..56110bb8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/caron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="caron" format="2">
-  <advance width="376"/>
+  <advance width="500"/>
   <unicode hex="02C7"/>
   <outline>
-    <component base="caroncomb" xOffset="3"/>
+    <component base="caroncomb" xOffset="68"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
index 6443fff3..205e3921 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cedilla.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cedilla" format="2">
-  <advance width="327"/>
+  <advance width="500"/>
   <unicode hex="00B8"/>
   <outline>
-    <component base="cedillacomb" xOffset="-3"/>
+    <component base="cedillacomb" xOffset="83"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
index e851c707..17d22094 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflex.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflex" format="2">
-  <advance width="377"/>
+  <advance width="500"/>
   <unicode hex="02C6"/>
   <outline>
-    <component base="circumflexcomb" xOffset="-8"/>
+    <component base="circumflexcomb" xOffset="56"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif 
b/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
index 7f9636e5..46631def 100644
--- a/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/commaturnedmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="commaturnedmod" format="2">
-  <advance width="329"/>
+  <advance width="157"/>
   <unicode hex="02BB"/>
   <outline>
-    <component base="commaturnedabovecomb"/>
+    <component base="commaturnedabovecomb" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresis.glif b/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
index ecd46f0f..fe354d54 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresis.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dieresis" format="2">
-  <advance width="466"/>
+  <advance width="500"/>
   <unicode hex="00A8"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-3"/>
+    <component base="dieresiscomb" xOffset="17"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif b/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
index 20daa8bb..ccd46cf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dotaccent.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dotaccent" format="2">
-  <advance width="266"/>
+  <advance width="500"/>
   <unicode hex="02D9"/>
   <outline>
-    <component base="dotaccentcomb" xOffset="-3"/>
+    <component base="dotaccentcomb" xOffset="117"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
index 275d084d..461a78eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/doubleprimemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="doubleprimemod" format="2">
-  <advance width="510"/>
+  <advance width="341"/>
   <unicode hex="02BA"/>
   <outline>
-    <component base="second"/>
+    <component base="second" xOffset="-81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/estimated.glif b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
index 93f9c4ce..80566d58 100644
--- a/src/Cantarell-Regular.ufo/glyphs/estimated.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/estimated.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="estimated" format="2">
-  <advance width="849"/>
+  <advance width="821"/>
   <unicode hex="212E"/>
   <outline>
     <contour>
-      <point x="428" y="-10" type="curve" smooth="yes"/>
-      <point x="559" y="-10"/>
-      <point x="683" y="42"/>
-      <point x="755" y="119" type="curve"/>
-      <point x="689" y="119" type="line"/>
-      <point x="617" y="62"/>
-      <point x="525" y="36"/>
-      <point x="436" y="36" type="curve" smooth="yes"/>
-      <point x="314" y="36"/>
-      <point x="240" y="84"/>
-      <point x="193" y="145" type="curve"/>
-      <point x="193" y="315" type="line"/>
-      <point x="776" y="315" type="line"/>
-      <point x="776" y="545"/>
-      <point x="659" y="704"/>
-      <point x="431" y="704" type="curve" smooth="yes"/>
-      <point x="200" y="704"/>
-      <point x="82" y="541"/>
-      <point x="82" y="339" type="curve" smooth="yes"/>
-      <point x="82" y="123"/>
-      <point x="218" y="-10"/>
+      <point x="414" y="-10" type="curve" smooth="yes"/>
+      <point x="545" y="-10"/>
+      <point x="669" y="42"/>
+      <point x="741" y="119" type="curve"/>
+      <point x="675" y="119" type="line"/>
+      <point x="603" y="62"/>
+      <point x="511" y="36"/>
+      <point x="422" y="36" type="curve" smooth="yes"/>
+      <point x="300" y="36"/>
+      <point x="226" y="84"/>
+      <point x="179" y="145" type="curve"/>
+      <point x="179" y="315" type="line"/>
+      <point x="762" y="315" type="line"/>
+      <point x="762" y="545"/>
+      <point x="645" y="704"/>
+      <point x="417" y="704" type="curve" smooth="yes"/>
+      <point x="186" y="704"/>
+      <point x="68" y="541"/>
+      <point x="68" y="339" type="curve" smooth="yes"/>
+      <point x="68" y="123"/>
+      <point x="204" y="-10"/>
     </contour>
     <contour>
-      <point x="193" y="358" type="line"/>
-      <point x="193" y="535" type="line"/>
-      <point x="239" y="619"/>
-      <point x="314" y="662"/>
-      <point x="428" y="662" type="curve" smooth="yes"/>
-      <point x="542" y="662"/>
-      <point x="616" y="619"/>
-      <point x="662" y="535" type="curve"/>
-      <point x="662" y="358" type="line"/>
+      <point x="179" y="358" type="line"/>
+      <point x="179" y="535" type="line"/>
+      <point x="225" y="619"/>
+      <point x="300" y="662"/>
+      <point x="414" y="662" type="curve" smooth="yes"/>
+      <point x="528" y="662"/>
+      <point x="602" y="619"/>
+      <point x="648" y="535" type="curve"/>
+      <point x="648" y="358" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
index b73dfb90..bda7748b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/firsttonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="firsttonechinese" format="2">
-  <advance width="489"/>
+  <advance width="397"/>
   <unicode hex="02C9"/>
   <outline>
-    <component base="macroncomb"/>
+    <component base="macroncomb" xOffset="-46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
index c6bda958..f7823401 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fourthtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fourthtonechinese" format="2">
-  <advance width="260"/>
+  <advance width="159"/>
   <unicode hex="02CB"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="-42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/grave.glif b/src/Cantarell-Regular.ufo/glyphs/grave.glif
index 47f01017..b0e65635 100644
--- a/src/Cantarell-Regular.ufo/glyphs/grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/grave.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="grave" format="2">
-  <advance width="260"/>
+  <advance width="500"/>
   <unicode hex="0060"/>
   <outline>
-    <component base="gravecomb"/>
+    <component base="gravecomb" xOffset="130"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
index 0c21c4c9..12d80537 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hungarumlaut.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hungarumlaut" format="2">
-  <advance width="439"/>
+  <advance width="500"/>
   <unicode hex="02DD"/>
   <outline>
-    <component base="hungarumlautcomb" xOffset="-7"/>
+    <component base="hungarumlautcomb" xOffset="31"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
index 12edf0d1..66128fec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ie-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="ie-cy" format="2">
   <advance width="528"/>
   <unicode hex="0435"/>
-  <anchor x="265" y="482" name="top"/>
   <outline>
     <component base="e"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
index a30920ba..253ad639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iebreve-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="brevecomb-cy" xOffset="43"/>
+    <component base="brevecomb-cy" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
index 915a9355..90cfd1eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iegrave-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="gravecomb" xOffset="87"/>
+    <component base="gravecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
index 9b5758ba..fb35e7b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/io-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
-    <component base="dieresiscomb" xOffset="32"/>
+    <component base="dieresiscomb" xOffset="38"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/macron.glif b/src/Cantarell-Regular.ufo/glyphs/macron.glif
index 596cb229..f2d450d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/macron.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="macron" format="2">
-  <advance width="483"/>
+  <advance width="500"/>
   <unicode hex="00AF"/>
   <outline>
-    <component base="macroncomb" xOffset="-3"/>
+    <component base="macroncomb" xOffset="6"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
index 644f725b..bbf49078 100644
--- a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="o-cy" format="2">
   <advance width="567"/>
   <unicode hex="043E"/>
-  <anchor x="285" y="482" name="top"/>
   <outline>
     <component base="o"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
index cb8a303d..6c2bb069 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
-    <component base="dieresiscomb" xOffset="52"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
index 401eb8b9..31f53490 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ogonek.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ogonek" format="2">
-  <advance width="600"/>
+  <advance width="500"/>
   <unicode hex="02DB"/>
   <outline>
-    <component base="ogonekcomb"/>
+    <component base="ogonekcomb" xOffset="-100"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
index 46fc7740..a1302e1e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/periodcentered.loclC_A_T_.case.glif
@@ -2,6 +2,6 @@
 <glyph name="periodcentered.loclCAT.case" format="2">
   <anchor x="0" y="352" name="_periodcentered"/>
   <outline>
-    <component base="period" xOffset="-252" yOffset="304"/>
+    <component base="period" xOffset="-272" yOffset="304"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/primemod.glif b/src/Cantarell-Regular.ufo/glyphs/primemod.glif
index 27542f11..05f62a17 100644
--- a/src/Cantarell-Regular.ufo/glyphs/primemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/primemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="primemod" format="2">
-  <advance width="330"/>
+  <advance width="161"/>
   <unicode hex="02B9"/>
   <outline>
-    <component base="minute"/>
+    <component base="minute" xOffset="-81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ring.glif b/src/Cantarell-Regular.ufo/glyphs/ring.glif
index d88b8d24..8d239714 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ring.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ring" format="2">
-  <advance width="341"/>
+  <advance width="500"/>
   <unicode hex="02DA"/>
   <outline>
-    <component base="ringcomb" xOffset="-3"/>
+    <component base="ringcomb" xOffset="77"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif 
b/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
index a5ebcaf1..f593101d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ringhalfleft.glif
@@ -1,8 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfleft" format="2">
-  <advance width="260"/>
+  <advance width="177"/>
   <unicode hex="02BF"/>
   <outline>
-    <component base="ringhalfright" xScale="-1" xOffset="260"/>
+    <component base="ringhalfright" xScale="-1" xOffset="177"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>=|ringhalfright</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>=|ringhalfright</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif 
b/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
index 4fa0908c..6736cbee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ringhalfright.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ringhalfright" format="2">
-  <advance width="258"/>
+  <advance width="177"/>
   <unicode hex="02BE"/>
   <outline>
     <contour>
-      <point x="76" y="556" type="line"/>
-      <point x="154" y="557"/>
-      <point x="195" y="593"/>
-      <point x="195" y="660" type="curve" smooth="yes"/>
-      <point x="195" y="726"/>
-      <point x="154" y="760"/>
-      <point x="76" y="760" type="curve"/>
-      <point x="76" y="700" type="line"/>
-      <point x="113" y="700"/>
-      <point x="133" y="686"/>
-      <point x="133" y="659" type="curve" smooth="yes"/>
-      <point x="133" y="632"/>
-      <point x="113" y="617"/>
-      <point x="76" y="616" type="curve"/>
+      <point x="33" y="556" type="line"/>
+      <point x="111" y="557"/>
+      <point x="152" y="593"/>
+      <point x="152" y="660" type="curve" smooth="yes"/>
+      <point x="152" y="726"/>
+      <point x="111" y="760"/>
+      <point x="33" y="760" type="curve"/>
+      <point x="33" y="700" type="line"/>
+      <point x="70" y="700"/>
+      <point x="90" y="686"/>
+      <point x="90" y="659" type="curve" smooth="yes"/>
+      <point x="90" y="632"/>
+      <point x="70" y="617"/>
+      <point x="33" y="616" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif 
b/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
index f518b3e9..910ecaee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/secondtonechinese.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="secondtonechinese" format="2">
-  <advance width="255"/>
+  <advance width="158"/>
   <unicode hex="02CA"/>
   <outline>
-    <component base="acutecomb"/>
+    <component base="acutecomb" xOffset="-55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/te-cy.glif b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
index 75866746..44bdcec8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/te-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="te-cy" format="2">
   <advance width="487"/>
   <unicode hex="0442"/>
-  <anchor x="474" y="0" name="bottomright"/>
   <outline>
     <contour>
       <point x="203" y="0" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tilde.glif b/src/Cantarell-Regular.ufo/glyphs/tilde.glif
index 9c4873f6..c6851135 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tilde.glif
@@ -1,8 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tilde" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <unicode hex="02DC"/>
   <outline>
-    <component base="tildecomb" xOffset="-3"/>
+    <component base="tildecomb" xOffset="13"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>enspace</string>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
index 28570aff..1604de11 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u-cy.glif
@@ -2,7 +2,6 @@
 <glyph name="u-cy" format="2">
   <advance width="480"/>
   <unicode hex="0443"/>
-  <anchor x="255" y="482" name="top"/>
   <outline>
     <component base="y"/>
   </outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
index 1bbe1e07..ed1c3904 100644
--- a/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/udieresis-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
-    <component base="dieresiscomb" xOffset="22"/>
+    <component base="dieresiscomb" xOffset="-3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
index 5a6918a4..d20f43fc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/uhungarumlaut-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
-    <component base="hungarumlautcomb" xOffset="67"/>
+    <component base="hungarumlautcomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
index bbecd793..9a58e784 100644
--- a/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/umacron-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
-    <component base="macroncomb" xOffset="10"/>
+    <component base="macroncomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
index 8881c0c2..6fb95817 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ushort-cy.glif
@@ -4,6 +4,6 @@
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
-    <component base="brevecomb-cy" xOffset="33"/>
+    <component base="brevecomb-cy" xOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
index 852a7008..de64e15a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ve-cy.glif
@@ -22,22 +22,22 @@
       <point x="355" y="67"/>
       <point x="285" y="67" type="curve" smooth="yes"/>
       <point x="163" y="67" type="line"/>
-      <point x="163" y="415" type="line"/>
-      <point x="264" y="415" type="line" smooth="yes"/>
-      <point x="332" y="415"/>
-      <point x="370" y="391"/>
-      <point x="370" y="348" type="curve" smooth="yes"/>
-      <point x="370" y="311"/>
-      <point x="343" y="286"/>
-      <point x="282" y="267" type="curve"/>
-      <point x="379" y="260" type="line"/>
-      <point x="423" y="276"/>
-      <point x="453" y="319"/>
-      <point x="453" y="366" type="curve" smooth="yes"/>
-      <point x="453" y="440"/>
-      <point x="387" y="482"/>
-      <point x="272" y="482" type="curve" smooth="yes"/>
-      <point x="83" y="482" type="line"/>
+      <point x="163" y="417" type="line"/>
+      <point x="264" y="417" type="line" smooth="yes"/>
+      <point x="332" y="417"/>
+      <point x="370" y="393"/>
+      <point x="370" y="350" type="curve" smooth="yes"/>
+      <point x="370" y="313"/>
+      <point x="343" y="288"/>
+      <point x="282" y="269" type="curve"/>
+      <point x="379" y="262" type="line"/>
+      <point x="423" y="278"/>
+      <point x="453" y="321"/>
+      <point x="453" y="368" type="curve" smooth="yes"/>
+      <point x="453" y="442"/>
+      <point x="387" y="484"/>
+      <point x="272" y="484" type="curve" smooth="yes"/>
+      <point x="83" y="484" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
index c0c43941..a3c02e6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallinelowmod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinelowmod" format="2">
-  <advance width="250"/>
+  <advance width="148"/>
   <unicode hex="02CC"/>
   <outline>
-    <component base="verticallinebelowcomb"/>
+    <component base="verticallinebelowcomb" xOffset="-50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
index 2f89be6e..4bd39b41 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallinemod.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="verticallinemod" format="2">
-  <advance width="250"/>
+  <advance width="148"/>
   <unicode hex="02C8"/>
   <outline>
-    <component base="verticallineabovecomb"/>
+    <component base="verticallineabovecomb" xOffset="-51"/>
   </outline>
 </glyph>


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