[cantarell-fonts/respacing] Continue to respace Thin



commit 0d4b6520eb5493f5728b552319d917d193687fa8
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun Oct 27 01:05:06 2019 +0100

    Continue to respace Thin

 src/Cantarell-Light.ufo/glyphs/A_-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/A_.glif             |  32 ++---
 src/Cantarell-Light.ufo/glyphs/A_E_.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/A_E_acute.glif      |   2 +-
 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 +-
 src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif        |   2 +-
 .../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_.glif             |  58 ++++-----
 src/Cantarell-Light.ufo/glyphs/C_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedilla.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/C_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/C_he-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_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_-cy.glif          |  62 ++++-----
 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 +-
 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_reversed-cy.glif  |  64 +++++-----
 src/Cantarell-Light.ufo/glyphs/E_s-cy.glif         |   2 +-
 .../glyphs/E_sdescender-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/F_ita-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/G_.glif             |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/G_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/G_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       |   4 +-
 src/Cantarell-Light.ufo/glyphs/H_.glif             |  34 ++---
 src/Cantarell-Light.ufo/glyphs/H_a-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         |   2 +-
 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         |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/I_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         |   2 +-
 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/I_zhitsa-cy.glif    |  30 ++---
 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                    |   2 +-
 .../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             |  30 ++---
 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          |   2 +-
 src/Cantarell-Light.ufo/glyphs/O_.glif             |  64 +++++-----
 src/Cantarell-Light.ufo/glyphs/O_E_.glif           |  82 ++++++------
 src/Cantarell-Light.ufo/glyphs/O_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_circumflex.glif   |   4 +-
 .../glyphs/O_circumflexacute.glif                  |   6 +-
 .../glyphs/O_circumflexdotbelow.glif               |   6 +-
 .../glyphs/O_circumflexgrave.glif                  |   6 +-
 .../glyphs/O_circumflexhookabove.glif              |   6 +-
 .../glyphs/O_circumflextilde.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif  |   2 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis.glif     |   4 +-
 .../glyphs/O_dieresismacron.glif                   |   6 +-
 .../glyphs/O_dotaccentmacron.glif                  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horn.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_hornacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horngrave.glif    |   4 +-
 .../glyphs/O_hornhookabove.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_horntilde.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif |   4 +-
 .../glyphs/O_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_macron.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_macronacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_slash.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_slashacute.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif   |   6 +-
 .../glyphs/O_tildedieresis.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif  |   6 +-
 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             |  62 ++++-----
 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_chwa-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/S_chwa.glif         |   2 +-
 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         |   2 +-
 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/U_.glif             |  44 +++----
 src/Cantarell-Light.ufo/glyphs/U_acute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_breve.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_caron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_circumflex.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_dieresis.glif     |   4 +-
 .../glyphs/U_dieresisacute.glif                    |   6 +-
 .../glyphs/U_dieresiscaron.glif                    |   6 +-
 .../glyphs/U_dieresisgrave.glif                    |   6 +-
 .../glyphs/U_dieresismacron.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/U_dotbelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_grave.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hookabove.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horn.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hornacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horngrave.glif    |   4 +-
 .../glyphs/U_hornhookabove.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_horntilde.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif |   4 +-
 .../glyphs/U_invertedbreve.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_macron.glif       |   4 +-
 .../glyphs/U_macrondieresis.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/U_ogonek.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_ring.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif  |   2 +-
 .../glyphs/U_straightstroke-cy.glif                |   2 +-
 src/Cantarell-Light.ufo/glyphs/U_tilde.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/V_.glif             |  22 ++--
 src/Cantarell-Light.ufo/glyphs/V_e-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/W_.glif             |  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             |  26 ++--
 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/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/a-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/a.glif              |  82 ++++++------
 src/Cantarell-Light.ufo/glyphs/aacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/abreve-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/abreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/abreveacute.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/abrevegrave.glif    |   6 +-
 .../glyphs/abrevehookabove.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/abrevetilde.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/acaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/acircumflex.glif    |   4 +-
 .../glyphs/acircumflexacute.glif                   |   6 +-
 .../glyphs/acircumflexdotbelow.glif                |   6 +-
 .../glyphs/acircumflexgrave.glif                   |   6 +-
 .../glyphs/acircumflexhookabove.glif               |   6 +-
 .../glyphs/acircumflextilde.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/adblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/adieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/adotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ae.glif             | 140 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/aeacute.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/agrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ahookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/aie-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/amacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/aogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/aring.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/aringacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/atilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/b.glif              |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/bar.glif            |  10 +-
 src/Cantarell-Light.ufo/glyphs/blank.glif          |  18 +--
 src/Cantarell-Light.ufo/glyphs/brokenbar.glif      |  18 +--
 src/Cantarell-Light.ufo/glyphs/c.glif              |  58 ++++-----
 src/Cantarell-Light.ufo/glyphs/cacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ccaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ccedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/ccircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/cdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/che-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif |   2 +-
 .../glyphs/chekhakassian-cy.glif                   |   2 +-
 .../glyphs/cheverticalstroke-cy.glif               |   2 +-
 src/Cantarell-Light.ufo/glyphs/d.glif              |  72 +++++------
 src/Cantarell-Light.ufo/glyphs/dcaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/dcroat.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ddotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/dje-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/dlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/dzcaron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/dze-cy.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif        |  26 ++--
 src/Cantarell-Light.ufo/glyphs/e-cy.glif           |  66 +++++-----
 src/Cantarell-Light.ufo/glyphs/e.glif              |  72 +++++------
 src/Cantarell-Light.ufo/glyphs/eacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ebreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ecaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif  |   6 +-
 src/Cantarell-Light.ufo/glyphs/ecircumflex.glif    |   4 +-
 .../glyphs/ecircumflexacute.glif                   |   6 +-
 .../glyphs/ecircumflexdotbelow.glif                |   6 +-
 .../glyphs/ecircumflexgrave.glif                   |   6 +-
 .../glyphs/ecircumflexhookabove.glif               |   6 +-
 .../glyphs/ecircumflextilde.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/edblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/edieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/edotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/edotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ef-cy.glif          | 114 ++++++++---------
 src/Cantarell-Light.ufo/glyphs/egrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ehookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/el-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/em-cy.glif          |  34 ++---
 src/Cantarell-Light.ufo/glyphs/emacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/emacronacute.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/emacrongrave.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/en-cy.glif          |  28 ++---
 src/Cantarell-Light.ufo/glyphs/endescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/eng.glif            |  64 +++++-----
 src/Cantarell-Light.ufo/glyphs/enghe-cy.glif       |  30 ++---
 src/Cantarell-Light.ufo/glyphs/eogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/er-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/es-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif |   2 +-
 src/Cantarell-Light.ufo/glyphs/eth.glif            |  74 +++++------
 src/Cantarell-Light.ufo/glyphs/etilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/f.glif              |  46 +++----
 src/Cantarell-Light.ufo/glyphs/fi.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/fita-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/fl.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/g.glif              |  92 +++++++-------
 src/Cantarell-Light.ufo/glyphs/gbreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/gdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ge-cy.glif          |  18 +--
 src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/germandbls.glif     |  82 ++++++------
 .../glyphs/ghemiddlehook-cy.glif                   |  54 ++++----
 src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif   |  18 +--
 src/Cantarell-Light.ufo/glyphs/gje-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/gmacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/h.glif              |  48 +++----
 src/Cantarell-Light.ufo/glyphs/ha-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/hbar.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/hcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/hdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/i-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/i.glif              |   4 +-
 src/Cantarell-Light.ufo/glyphs/ia-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/iacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ibreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/icaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/icircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/idblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idieresisacute.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/idotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/idotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/idotless.glif       |  16 +--
 src/Cantarell-Light.ufo/glyphs/ie-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/igrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ihookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ii-cy.glif          |  30 ++---
 src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/iishort-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/imacron-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/imacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/io-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/iogonek.glif        |   6 +-
 src/Cantarell-Light.ufo/glyphs/itilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/iu-cy.glif          |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif     |  30 ++---
 src/Cantarell-Light.ufo/glyphs/j.glif              |   4 +-
 src/Cantarell-Light.ufo/glyphs/jacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/jcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/jdotless.glif       |  26 ++--
 src/Cantarell-Light.ufo/glyphs/je-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/k.glif              |  28 ++---
 src/Cantarell-Light.ufo/glyphs/ka-cy.glif          |  36 +++---
 src/Cantarell-Light.ufo/glyphs/kacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif |   2 +-
 .../glyphs/kaverticalstroke-cy.glif                |  40 +++---
 src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif   |  24 ++--
 src/Cantarell-Light.ufo/glyphs/kje-cy.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/l.glif              |  44 +++----
 src/Cantarell-Light.ufo/glyphs/l.ss01.glif         |  20 +--
 src/Cantarell-Light.ufo/glyphs/lacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/layerinfo.plist     |   2 +-
 src/Cantarell-Light.ufo/glyphs/lcaron.glif         |   2 +-
 src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/ldot.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/ldotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/lj.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/llinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/lslash.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/m.glif              |  80 ++++++------
 src/Cantarell-Light.ufo/glyphs/mdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/micro.glif          |  48 +++----
 src/Cantarell-Light.ufo/glyphs/n.glif              |  48 +++----
 src/Cantarell-Light.ufo/glyphs/nacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ncaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/ndotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ndotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/nj.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/nje-cy.glif         |  62 ++++-----
 src/Cantarell-Light.ufo/glyphs/nlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ntilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/numero.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/o-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/o.glif              |  60 ++++-----
 src/Cantarell-Light.ufo/glyphs/oacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/obarred-cy.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/obreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ocaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ocircumflex.glif    |   4 +-
 .../glyphs/ocircumflexacute.glif                   |   6 +-
 .../glyphs/ocircumflexdotbelow.glif                |   6 +-
 .../glyphs/ocircumflexgrave.glif                   |   6 +-
 .../glyphs/ocircumflexhookabove.glif               |   6 +-
 .../glyphs/ocircumflextilde.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/odblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/odieresis.glif      |   4 +-
 .../glyphs/odieresismacron.glif                    |   6 +-
 .../glyphs/odotaccentmacron.glif                   |   6 +-
 src/Cantarell-Light.ufo/glyphs/odotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/oe.glif             | 116 ++++++++---------
 src/Cantarell-Light.ufo/glyphs/ograve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorn.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohornacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorngrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohorntilde.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/omacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/omacronacute.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/omacrongrave.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/oogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/oslash.glif         |  60 ++++-----
 src/Cantarell-Light.ufo/glyphs/oslashacute.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/otilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/otildeacute.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/otildedieresis.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/otildemacron.glif   |   6 +-
 src/Cantarell-Light.ufo/glyphs/p.glif              |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/palochka-cy.glif    |   2 +-
 src/Cantarell-Light.ufo/glyphs/paragraph.glif      |  30 ++---
 src/Cantarell-Light.ufo/glyphs/pe-cy.glif          |  20 +--
 src/Cantarell-Light.ufo/glyphs/product.glif        |  18 +--
 src/Cantarell-Light.ufo/glyphs/q.glif              |  68 +++++-----
 src/Cantarell-Light.ufo/glyphs/qa-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/r.glif              |  44 +++----
 src/Cantarell-Light.ufo/glyphs/racute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/rcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/rdblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/rdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/rlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/s.glif              |  70 +++++------
 src/Cantarell-Light.ufo/glyphs/sacute.glif         |   4 +-
 .../glyphs/sacutedotaccent.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/saltillo.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/scaron.glif         |   4 +-
 .../glyphs/scarondotaccent.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/scedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/schwa-cy.glif       |   2 +-
 src/Cantarell-Light.ufo/glyphs/schwa.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/scircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/scommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/sdotbelow.glif      |   4 +-
 .../glyphs/sdotbelowdotaccent.glif                 |   6 +-
 src/Cantarell-Light.ufo/glyphs/sha-cy.glif         |  28 ++---
 src/Cantarell-Light.ufo/glyphs/shcha-cy.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/shha-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/softsign-cy.glif    |  42 +++----
 src/Cantarell-Light.ufo/glyphs/space.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/t.glif              |  50 ++++----
 src/Cantarell-Light.ufo/glyphs/tbar.glif           |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcedilla.glif       |   4 +-
 src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif   |   4 +-
 src/Cantarell-Light.ufo/glyphs/tdieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/tdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/thorn.glif          |  62 ++++-----
 src/Cantarell-Light.ufo/glyphs/tlinebelow.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/tse-cy.glif         |  26 ++--
 src/Cantarell-Light.ufo/glyphs/tshe-cy.glif        |   2 +-
 src/Cantarell-Light.ufo/glyphs/u-cy.glif           |   2 +-
 src/Cantarell-Light.ufo/glyphs/u.glif              |  52 ++++----
 src/Cantarell-Light.ufo/glyphs/uacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ubreve.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ucircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/udblgrave.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif   |   2 +-
 src/Cantarell-Light.ufo/glyphs/udieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/udieresisacute.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif |   6 +-
 src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif |   6 +-
 .../glyphs/udieresismacron.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/udotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ugrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorn.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornacute.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorngrave.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/uhorntilde.glif     |   4 +-
 .../glyphs/uhungarumlaut-cy.glif                   |   2 +-
 src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif  |   4 +-
 src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif |   4 +-
 src/Cantarell-Light.ufo/glyphs/umacron-cy.glif     |   2 +-
 src/Cantarell-Light.ufo/glyphs/umacron.glif        |   4 +-
 .../glyphs/umacrondieresis.glif                    |   6 +-
 src/Cantarell-Light.ufo/glyphs/uogonek.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/uring.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ushort-cy.glif      |   2 +-
 src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif   |   2 +-
 .../glyphs/ustraightstroke-cy.glif                 |   2 +-
 src/Cantarell-Light.ufo/glyphs/utilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/utildeacute.glif    |   6 +-
 src/Cantarell-Light.ufo/glyphs/v.glif              |  22 ++--
 src/Cantarell-Light.ufo/glyphs/ve-cy.glif          |  70 +++++------
 src/Cantarell-Light.ufo/glyphs/w.glif              |  38 +++---
 src/Cantarell-Light.ufo/glyphs/wacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/wcircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/wdieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/we-cy.glif          |   2 +-
 src/Cantarell-Light.ufo/glyphs/wgrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/x.glif              |  30 ++---
 src/Cantarell-Light.ufo/glyphs/y.glif              |  26 ++--
 src/Cantarell-Light.ufo/glyphs/yacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/ycircumflex.glif    |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydieresis.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/ydotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/glyphs/yeru-cy.glif        |  52 ++++----
 .../glyphs/yerudieresis-cy.glif                    |   4 +-
 src/Cantarell-Light.ufo/glyphs/ygrave.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/yhookabove.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/yi-cy.glif          |   4 +-
 src/Cantarell-Light.ufo/glyphs/ymacron.glif        |   4 +-
 src/Cantarell-Light.ufo/glyphs/ytilde.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/z.glif              |  30 ++---
 src/Cantarell-Light.ufo/glyphs/zacute.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/zcaron.glif         |   4 +-
 src/Cantarell-Light.ufo/glyphs/zdotaccent.glif     |   4 +-
 src/Cantarell-Light.ufo/glyphs/zdotbelow.glif      |   4 +-
 src/Cantarell-Light.ufo/lib.plist                  |   2 +-
 640 files changed, 3593 insertions(+), 3591 deletions(-)
---
diff --git a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
index 23d06552..89f51570 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="603"/>
+  <advance width="628"/>
   <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 0b41e37f..562acd4e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="603"/>
+  <advance width="628"/>
   <unicode hex="0041"/>
   <note>
 A
 </note>
-  <anchor x="314" y="0" name="bottom"/>
-  <anchor x="576" y="10" name="ogonek"/>
-  <anchor x="317" y="694" name="top"/>
+  <anchor x="320" y="0" name="bottom"/>
+  <anchor x="582" y="10" name="ogonek"/>
+  <anchor x="323" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="32" y="0" type="line"/>
-      <point x="54" y="0" type="line"/>
-      <point x="317" y="676" type="line"/>
-      <point x="313" y="676" type="line"/>
-      <point x="558" y="0" type="line"/>
-      <point x="582" y="0" type="line"/>
-      <point x="328" y="694" type="line"/>
-      <point x="305" y="694" type="line"/>
+      <point x="38" y="0" type="line"/>
+      <point x="60" y="0" type="line"/>
+      <point x="323" y="676" type="line"/>
+      <point x="319" y="676" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="334" y="694" type="line"/>
+      <point x="311" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="141" y="249" type="line"/>
-      <point x="481" y="249" type="line"/>
-      <point x="475" y="268" type="line"/>
-      <point x="146" y="268" type="line"/>
+      <point x="147" y="249" type="line"/>
+      <point x="487" y="249" type="line"/>
+      <point x="481" y="268" type="line"/>
+      <point x="152" y="268" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_.glif b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
index ceb6fdab..1bde8972 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="868"/>
+  <advance width="869"/>
   <unicode hex="00C6"/>
   <anchor x="449" y="0" name="bottom"/>
   <anchor x="449" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
index 2a3091ff..0a783ec8 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="868"/>
+  <advance width="869"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
index 8beb46a6..1a4944ab 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="259"/>
+    <component base="acutecomb.case" xOffset="265"/>
   </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 d2bbc559..7877453c 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="603"/>
+  <advance width="628"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="124"/>
+    <component base="brevecomb-cy.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve.glif b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
index af7779d9..c69b1fd1 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="603"/>
+  <advance width="628"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="114"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
index 8490af3d..9b96328e 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="109" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="242" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="248" 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 ebc7d0e2..0195a319 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="194"/>
-    <component base="brevecomb.case" xOffset="114"/>
+    <component base="dotbelowcomb" xOffset="200"/>
+    <component base="brevecomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
index c2578b0f..a5dc127e 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="109" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="138" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="144" 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 5ced2c5a..8226be96 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="109" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="169" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="175" 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 c6a8efbe..624094d9 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="109" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="80" yOffset="294"/>
+    <component base="brevecomb.loclVIET" xOffset="115" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="86" 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 99b67c54..49953212 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="603"/>
+  <advance width="628"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="142"/>
+    <component base="caroncomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
index 6db3a1ce..07e27a18 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="140"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
index 8e86e7af..9d7734f5 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="360" 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/A_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
index 4b8cc6c3..2653aeaa 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="194"/>
-    <component base="circumflexcomb.case" xOffset="140"/>
+    <component base="dotbelowcomb" xOffset="200"/>
+    <component base="circumflexcomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
index 82183278..88153508 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="256" 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/A_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
index df2a9f9f..581c82ba 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="287" 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/A_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
index 52044626..ac27afc6 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="141" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="90" 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/A_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
index 2e6f07ac..fbf5585e 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="603"/>
+  <advance width="628"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="74"/>
+    <component base="dblgravecomb.case" xOffset="80"/>
   </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 29c87e75..efa89953 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="603"/>
+  <advance width="628"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
index 034113fc..a5b7c630 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
index 4c432798..06527dfa 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="194"/>
+    <component base="dotbelowcomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_grave.glif b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
index fe5363a8..2fc3f081 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="120"/>
+    <component base="gravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
index 42615cbd..aa04021d 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="603"/>
+  <advance width="628"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="162"/>
+    <component base="hookabovecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
index 698a66aa..9a87f32a 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="868"/>
+  <advance width="869"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
index d4eca584..8428d90b 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="603"/>
+  <advance width="628"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="111"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_macron.glif b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
index b80c7d91..c24a69ca 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="603"/>
+  <advance width="628"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="79"/>
+    <component base="macroncomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
index b22a013c..a3763fa8 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="603"/>
+  <advance width="628"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="175"/>
+    <component base="ogonekcomb" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ring.glif b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
index 3f89ac0d..2024b84e 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="143"/>
+    <component base="ringcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
index ffea8dfd..4cc0e582 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="603"/>
+  <advance width="628"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="158"/>
+    <component base="ringcomb_acutecomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
index 6d11f460..89d7c0b4 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="603"/>
+  <advance width="628"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="73"/>
+    <component base="tildecomb.case" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_.glif b/src/Cantarell-Light.ufo/glyphs/B_.glif
index 08e5a32c..a32b6968 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="611"/>
+  <advance width="634"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="261" y="0" name="bottom"/>
-  <anchor x="261" y="694" name="top"/>
+  <anchor x="277" y="0" name="bottom"/>
+  <anchor x="277" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="313" y="0" type="line" smooth="yes"/>
-      <point x="467" y="0"/>
-      <point x="551" y="68"/>
-      <point x="551" y="185" type="curve" smooth="yes"/>
-      <point x="551" y="300"/>
-      <point x="469" y="373"/>
-      <point x="347" y="373" type="curve" smooth="yes"/>
-      <point x="118" y="373" type="line"/>
-      <point x="118" y="356" type="line"/>
-      <point x="337" y="356" type="line" smooth="yes"/>
-      <point x="456" y="356"/>
-      <point x="529" y="288"/>
-      <point x="529" y="181" type="curve" smooth="yes"/>
-      <point x="529" y="75"/>
-      <point x="458" y="18"/>
-      <point x="324" y="18" type="curve" smooth="yes"/>
-      <point x="124" y="18" type="line"/>
-      <point x="124" y="676" type="line"/>
-      <point x="280" y="676" type="line" smooth="yes"/>
-      <point x="408" y="676"/>
-      <point x="478" y="622"/>
-      <point x="478" y="521" type="curve" smooth="yes"/>
-      <point x="478" y="442"/>
-      <point x="435" y="388"/>
-      <point x="351" y="369" type="curve"/>
-      <point x="377" y="365" type="line"/>
-      <point x="451" y="379"/>
-      <point x="500" y="444"/>
-      <point x="500" y="528" type="curve" smooth="yes"/>
-      <point x="500" y="635"/>
-      <point x="421" y="694"/>
-      <point x="280" y="694" type="curve" smooth="yes"/>
-      <point x="104" y="694" type="line"/>
+      <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 fce08515..e34121a6 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="600"/>
+  <advance width="616"/>
   <unicode hex="0411"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="312" y="0" type="line" smooth="yes"/>
-      <point x="457" y="0"/>
-      <point x="540" y="71"/>
-      <point x="540" y="195" type="curve" smooth="yes"/>
-      <point x="540" y="317"/>
-      <point x="465" y="393"/>
-      <point x="346" y="393" type="curve" smooth="yes"/>
-      <point x="118" y="393" type="line"/>
-      <point x="118" y="376" type="line"/>
-      <point x="336" y="376" type="line" smooth="yes"/>
-      <point x="448" y="376"/>
-      <point x="518" y="305"/>
-      <point x="518" y="191" type="curve" smooth="yes"/>
-      <point x="518" y="78"/>
-      <point x="450" y="18"/>
-      <point x="323" y="18" type="curve" smooth="yes"/>
-      <point x="126" y="18" type="line"/>
-      <point x="126" y="676" type="line"/>
-      <point x="470" y="676" type="line"/>
-      <point x="470" y="694" type="line"/>
-      <point x="104" 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_.glif b/src/Cantarell-Light.ufo/glyphs/C_.glif
index d9e7ba85..ccff108f 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="694" name="top"/>
+  <anchor x="359" y="0" name="bottom"/>
+  <anchor x="359" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="389" y="-10" type="curve" smooth="yes"/>
-      <point x="455" y="-10"/>
-      <point x="529" y="6"/>
-      <point x="590" y="33" type="curve"/>
-      <point x="585" y="49" type="line"/>
-      <point x="525" y="24"/>
-      <point x="453" y="9"/>
-      <point x="393" y="9" type="curve" smooth="yes"/>
-      <point x="210" y="9"/>
-      <point x="86" y="145"/>
-      <point x="86" y="348" type="curve" smooth="yes"/>
-      <point x="86" y="549"/>
-      <point x="213" y="683"/>
-      <point x="403" y="683" type="curve" smooth="yes"/>
-      <point x="463" y="683"/>
-      <point x="526" y="670"/>
-      <point x="584" y="645" type="curve"/>
-      <point x="591" y="662" type="line"/>
-      <point x="533" y="689"/>
-      <point x="470" y="702"/>
-      <point x="406" y="702" type="curve" smooth="yes"/>
-      <point x="201" y="702"/>
-      <point x="64" y="556"/>
-      <point x="64" y="338" type="curve" smooth="yes"/>
-      <point x="64" y="129"/>
-      <point x="195" y="-10"/>
+      <point x="395" y="-10" type="curve" smooth="yes"/>
+      <point x="461" y="-10"/>
+      <point x="535" y="6"/>
+      <point x="596" y="33" type="curve"/>
+      <point x="591" y="49" type="line"/>
+      <point x="531" y="24"/>
+      <point x="459" y="9"/>
+      <point x="399" y="9" type="curve" smooth="yes"/>
+      <point x="216" y="9"/>
+      <point x="92" y="145"/>
+      <point x="92" y="348" type="curve" smooth="yes"/>
+      <point x="92" y="549"/>
+      <point x="219" y="683"/>
+      <point x="409" y="683" type="curve" smooth="yes"/>
+      <point x="469" y="683"/>
+      <point x="532" y="670"/>
+      <point x="590" y="645" type="curve"/>
+      <point x="597" y="662" type="line"/>
+      <point x="539" y="689"/>
+      <point x="476" y="702"/>
+      <point x="412" y="702" type="curve" smooth="yes"/>
+      <point x="207" y="702"/>
+      <point x="70" y="556"/>
+      <point x="70" y="338" type="curve" smooth="yes"/>
+      <point x="70" y="129"/>
+      <point x="201" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_acute.glif b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
index b1d36e8a..3bbde990 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="295"/>
+    <component base="acutecomb.case" xOffset="301"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_caron.glif b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
index 447aaef0..706743f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="178"/>
+    <component base="caroncomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
index 60b9fd12..4e21eb93 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="228"/>
+    <component base="cedillacomb" xOffset="234"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
index 6556c70e..3fbe3f96 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="228"/>
-    <component base="acutecomb.case" xOffset="295"/>
+    <component base="cedillacomb" xOffset="234"/>
+    <component base="acutecomb.case" xOffset="301"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
index 8728c95d..1e2ff244 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="176"/>
+    <component base="circumflexcomb.case" xOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
index e6e0bd8b..a9e53436 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="234"/>
+    <component base="dotaccentcomb.case" xOffset="240"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/C_he-cy.glif
index 21a5cb44..7a642fd1 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="610"/>
+  <advance width="626"/>
   <unicode hex="0427"/>
   <anchor x="526" y="0" name="bottomright"/>
   <anchor x="309" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/C_hedieresis-cy.glif
index 54727dac..b4f4f5a3 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="610"/>
+  <advance width="626"/>
   <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 e3150b6c..fad87568 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="610"/>
+  <advance width="626"/>
   <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 80ac6262..8de28e4e 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="630"/>
+  <advance width="646"/>
   <unicode hex="04B8"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_.glif b/src/Cantarell-Light.ufo/glyphs/D_.glif
index 4d4efca4..1cb52649 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="679"/>
+  <advance width="701"/>
   <unicode hex="0044"/>
   <note>
 D
 </note>
-  <anchor x="334" y="0" name="bottom"/>
-  <anchor x="167" y="364" name="center"/>
-  <anchor x="324" 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="104" y="0" type="line"/>
-      <point x="267" y="0" type="line" smooth="yes"/>
-      <point x="485" y="0"/>
-      <point x="615" y="131"/>
-      <point x="615" y="353" type="curve" smooth="yes"/>
-      <point x="615" y="573"/>
-      <point x="494" y="694"/>
-      <point x="273" y="694" type="curve" smooth="yes"/>
-      <point x="104" 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="126" y="18" type="line"/>
-      <point x="126" y="676" type="line"/>
-      <point x="267" y="676" type="line" smooth="yes"/>
-      <point x="481" y="676"/>
-      <point x="593" y="564"/>
-      <point x="593" y="348" type="curve" smooth="yes"/>
-      <point x="593" y="138"/>
-      <point x="477" y="18"/>
-      <point x="273" 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 fefab2d7..c8d3924d 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="1267"/>
+  <advance width="1299"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="679"/>
+    <component base="Zcaron" xOffset="701"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
index bed9c6f8..f8d5c729 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="679"/>
+  <advance width="701"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="149"/>
+    <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 cfe15410..65c4860d 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="679"/>
+  <advance width="701"/>
   <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 9e3e14e8..15d03772 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="679"/>
+  <advance width="701"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="214"/>
+    <component base="dotbelowcomb" xOffset="230"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
index 0467ba24..a230b316 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="679"/>
+  <advance width="701"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="84"/>
+    <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 cbc43673..2d68a00e 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="1118"/>
+  <advance width="1152"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="679"/>
+    <component base="zcaron" xOffset="701"/>
   </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 7a157a8d..4e867e72 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="553"/>
+  <advance width="574"/>
   <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 1939ef88..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="688"/>
+  <advance width="720"/>
   <unicode hex="040F"/>
   <outline>
     <contour>
-      <point x="339" y="-175" type="line"/>
-      <point x="360" y="-175" type="line"/>
-      <point x="360" y="0" type="line"/>
-      <point x="584" y="0" type="line"/>
-      <point x="584" y="694" type="line"/>
-      <point x="563" y="694" type="line"/>
-      <point x="563" y="19" type="line"/>
-      <point x="126" y="19" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="339" 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_-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
index 46d56160..2ab94573 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E-cy" format="2">
-  <advance width="661"/>
+  <advance width="662"/>
   <unicode hex="0404"/>
   <outline>
     <contour>
-      <point x="400" y="-10" type="curve" smooth="yes"/>
-      <point x="468" y="-10"/>
-      <point x="545" y="6"/>
-      <point x="608" y="33" type="curve"/>
-      <point x="603" y="49" type="line"/>
-      <point x="541" y="24"/>
-      <point x="466" y="9"/>
-      <point x="404" y="9" type="curve" smooth="yes"/>
-      <point x="215" y="9"/>
-      <point x="86" y="146"/>
-      <point x="86" y="348" type="curve" smooth="yes"/>
-      <point x="86" y="549"/>
-      <point x="219" y="683"/>
-      <point x="414" y="683" type="curve" smooth="yes"/>
-      <point x="477" y="683"/>
-      <point x="542" y="670"/>
-      <point x="602" y="645" type="curve"/>
-      <point x="609" y="662" type="line"/>
-      <point x="549" y="689"/>
-      <point x="483" y="702"/>
-      <point x="417" y="702" type="curve" smooth="yes"/>
-      <point x="207" y="702"/>
-      <point x="64" y="556"/>
-      <point x="64" y="338" type="curve" smooth="yes"/>
-      <point x="64" y="129"/>
-      <point x="200" y="-10"/>
+      <point x="406" y="-10" type="curve" smooth="yes"/>
+      <point x="474" y="-10"/>
+      <point x="551" y="6"/>
+      <point x="614" y="33" type="curve"/>
+      <point x="609" y="49" type="line"/>
+      <point x="547" y="24"/>
+      <point x="472" y="9"/>
+      <point x="410" y="9" type="curve" smooth="yes"/>
+      <point x="221" y="9"/>
+      <point x="92" y="146"/>
+      <point x="92" y="348" type="curve" smooth="yes"/>
+      <point x="92" y="549"/>
+      <point x="225" y="683"/>
+      <point x="420" y="683" type="curve" smooth="yes"/>
+      <point x="483" y="683"/>
+      <point x="548" y="670"/>
+      <point x="608" y="645" type="curve"/>
+      <point x="615" y="662" type="line"/>
+      <point x="555" y="689"/>
+      <point x="489" y="702"/>
+      <point x="423" y="702" type="curve" smooth="yes"/>
+      <point x="213" y="702"/>
+      <point x="70" y="556"/>
+      <point x="70" y="338" type="curve" smooth="yes"/>
+      <point x="70" y="129"/>
+      <point x="206" y="-10"/>
     </contour>
     <contour>
-      <point x="69" y="349" type="line"/>
-      <point x="540" y="349" type="line"/>
-      <point x="540" y="367" type="line"/>
-      <point x="69" y="367" type="line"/>
+      <point x="75" y="349" type="line"/>
+      <point x="546" y="349" type="line"/>
+      <point x="546" y="367" type="line"/>
+      <point x="75" y="367" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index 90c7d30f..8fdae431 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="552"/>
+  <advance width="569"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="298" y="0" name="bottom"/>
-  <anchor x="492" y="10" name="ogonek"/>
-  <anchor x="297" y="694" name="top"/>
-  <anchor x="-13" y="694" name="topleft"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="508" y="10" name="ogonek"/>
+  <anchor x="313" y="694" name="top"/>
+  <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="498" y="0" type="line"/>
-      <point x="498" y="18" type="line"/>
-      <point x="125" y="18" type="line"/>
-      <point x="125" y="355" type="line"/>
-      <point x="471" y="355" type="line"/>
-      <point x="471" y="373" type="line"/>
-      <point x="125" y="373" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="498" y="676" type="line"/>
-      <point x="498" y="694" type="line"/>
-      <point x="104" 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 d395b957..0810e1dd 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="552"/>
+  <advance width="569"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="239"/>
+    <component base="acutecomb.case" xOffset="255"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_breve.glif b/src/Cantarell-Light.ufo/glyphs/E_breve.glif
index 939d3137..38aa813c 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="552"/>
+  <advance width="569"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="94"/>
+    <component base="brevecomb.case" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_caron.glif b/src/Cantarell-Light.ufo/glyphs/E_caron.glif
index 3b012d95..427ea9aa 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="552"/>
+  <advance width="569"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="122"/>
+    <component base="caroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_cedillabreve.glif
index 9ca16f69..b72d7ef4 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="552"/>
+  <advance width="569"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="173"/>
-    <component base="brevecomb.case" xOffset="94"/>
+    <component base="cedillacomb" xOffset="189"/>
+    <component base="brevecomb.case" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflex.glif
index 8ba0204a..25090f8c 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="552"/>
+  <advance width="569"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="120"/>
+    <component base="circumflexcomb.case" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index 03f6efde..235a4fac 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="340" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="137" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="356" 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 067482da..e28eb2c9 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="178"/>
-    <component base="circumflexcomb.case" xOffset="120"/>
+    <component base="dotbelowcomb" xOffset="194"/>
+    <component base="circumflexcomb.case" xOffset="136"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index 8a8b7567..84519eb5 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="236" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="137" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="252" 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 86da6a30..2641bfe0 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="267" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="137" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="283" 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 e59c49f6..a3a8c49e 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="121" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="70" yOffset="294"/>
+    <component base="circumflexcomb.loclVIET" xOffset="137" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="86" 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 586371ae..47dde5cb 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="552"/>
+  <advance width="569"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="54"/>
+    <component base="dblgravecomb.case" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/E_dieresis.glif
index ee5553b9..a50f4642 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="552"/>
+  <advance width="569"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="77"/>
+    <component base="dieresiscomb.case" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/E_dotaccent.glif
index b28f77b3..cf30fd5b 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="552"/>
+  <advance width="569"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="178"/>
+    <component base="dotaccentcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/E_dotbelow.glif
index b2a68fb5..860e5cf4 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="178"/>
+    <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 e71b5e75..eae65bf6 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="552"/>
+  <advance width="569"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="100"/>
+    <component base="gravecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/E_hookabove.glif
index 5159a92b..0d7b7a02 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="142"/>
+    <component base="hookabovecomb.case" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/E_invertedbreve.glif
index fa03d336..61d05be9 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="552"/>
+  <advance width="569"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="91"/>
+    <component base="breveinvertedcomb.case" xOffset="107"/>
   </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 056c11b6..227d2534 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="679"/>
+  <advance width="695"/>
   <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 3a0b3002..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="823"/>
+  <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 48adbbde..d78ee48d 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="552"/>
+  <advance width="569"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="59"/>
+    <component base="macroncomb.case" xOffset="75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_macronacute.glif
index 254456ed..8a752be4 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="552"/>
+  <advance width="569"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="59"/>
-    <component base="acutecomb.case" xOffset="239" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="75"/>
+    <component base="acutecomb.case" xOffset="255" 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 efaeb087..c7430137 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="552"/>
+  <advance width="569"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="59"/>
-    <component base="gravecomb.case" xOffset="100" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="75"/>
+    <component base="gravecomb.case" xOffset="116" 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 aa301c54..c3513a1b 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="690"/>
+  <advance width="722"/>
   <unicode hex="041D"/>
   <anchor x="606" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ng.glif b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
index 88ad0a9b..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="717"/>
+  <advance width="749"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="593" y="-10" type="line"/>
-      <point x="613" y="0" type="line"/>
-      <point x="613" y="694" type="line"/>
-      <point x="593" y="694" type="line"/>
-      <point x="593" y="20" type="line"/>
-      <point x="597" y="20" type="line"/>
-      <point x="133" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="674" type="line"/>
-      <point x="122" 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="507" y="-230" type="line"/>
-      <point x="571" y="-200"/>
-      <point x="613" y="-117"/>
-      <point x="613" y="-23" type="curve" smooth="yes"/>
-      <point x="613" y="0" type="line"/>
-      <point x="592" y="0" type="line"/>
-      <point x="592" y="-35" type="line" smooth="yes"/>
-      <point x="592" y="-112"/>
-      <point x="556" y="-186"/>
-      <point x="502" 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 8b48c11d..7d433287 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="870"/>
+  <advance width="886"/>
   <unicode hex="04A4"/>
   <outline>
     <contour>
-      <point x="564" y="0" type="line"/>
-      <point x="586" y="0" type="line"/>
-      <point x="586" y="676" type="line"/>
-      <point x="848" y="676" type="line"/>
-      <point x="848" y="694" type="line"/>
-      <point x="564" 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="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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="119" y="352" type="line"/>
-      <point x="570" y="352" type="line"/>
-      <point x="570" y="371" type="line"/>
-      <point x="119" 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 d6b9eccf..a3b8896e 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="552"/>
+  <advance width="569"/>
   <unicode hex="0118"/>
   <anchor x="285" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="91"/>
+    <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 333bf76e..a1503c4b 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="556"/>
+  <advance width="579"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
index 8efad513..d4d520c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_reversed-cy.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ereversed-cy" format="2">
-  <advance width="658"/>
+  <advance width="659"/>
   <unicode hex="042D"/>
-  <anchor x="333" y="694" name="top"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="249" y="-10" type="curve" smooth="yes"/>
-      <point x="460" y="-10"/>
-      <point x="594" y="133"/>
-      <point x="594" y="352" type="curve" smooth="yes"/>
-      <point x="594" y="566"/>
-      <point x="467" y="702"/>
-      <point x="270" y="702" type="curve" smooth="yes"/>
-      <point x="200" y="702"/>
-      <point x="114" y="685"/>
-      <point x="53" y="659" type="curve"/>
-      <point x="58" y="643" type="line"/>
-      <point x="117" y="667"/>
-      <point x="200" y="683"/>
-      <point x="266" y="683" type="curve" smooth="yes"/>
-      <point x="456" y="683"/>
-      <point x="572" y="545"/>
-      <point x="572" y="346" type="curve" smooth="yes"/>
-      <point x="572" y="140"/>
-      <point x="448" y="9"/>
-      <point x="255" y="9" type="curve" smooth="yes"/>
-      <point x="188" y="9"/>
-      <point x="115" y="23"/>
-      <point x="59" y="47" type="curve"/>
-      <point x="52" y="30" type="line"/>
-      <point x="108" y="5"/>
-      <point x="181" y="-10"/>
+      <point x="244" y="-10" type="curve" smooth="yes"/>
+      <point x="455" y="-10"/>
+      <point x="589" y="133"/>
+      <point x="589" y="352" type="curve" smooth="yes"/>
+      <point x="589" y="566"/>
+      <point x="462" y="702"/>
+      <point x="265" y="702" type="curve" smooth="yes"/>
+      <point x="195" y="702"/>
+      <point x="109" y="685"/>
+      <point x="48" y="659" type="curve"/>
+      <point x="53" y="643" type="line"/>
+      <point x="112" y="667"/>
+      <point x="195" y="683"/>
+      <point x="261" y="683" type="curve" smooth="yes"/>
+      <point x="451" y="683"/>
+      <point x="567" y="545"/>
+      <point x="567" y="346" type="curve" smooth="yes"/>
+      <point x="567" y="140"/>
+      <point x="443" y="9"/>
+      <point x="250" y="9" type="curve" smooth="yes"/>
+      <point x="183" y="9"/>
+      <point x="110" y="23"/>
+      <point x="54" y="47" type="curve"/>
+      <point x="47" y="30" type="line"/>
+      <point x="103" y="5"/>
+      <point x="176" y="-10"/>
     </contour>
     <contour>
-      <point x="103" y="352" type="line"/>
-      <point x="578" y="352" type="line"/>
-      <point x="578" y="370" type="line"/>
-      <point x="103" y="370" type="line"/>
+      <point x="98" y="352" type="line"/>
+      <point x="573" y="352" type="line"/>
+      <point x="573" y="370" type="line"/>
+      <point x="98" y="370" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
index 7ae9e302..bb25b240 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="0421"/>
   <anchor x="371" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
index d2d703c0..eb9c79d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="643"/>
+  <advance width="644"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_th.glif b/src/Cantarell-Light.ufo/glyphs/E_th.glif
index b92bef8e..37116226 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="679"/>
+  <advance width="701"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-74" 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 f4142307..f6801216 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="552"/>
+  <advance width="569"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="53"/>
+    <component base="tildecomb.case" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index a6017c22..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="533"/>
+  <advance width="548"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="264" y="0" name="bottom"/>
-  <anchor x="264" y="694" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="366" type="line"/>
-      <point x="467" y="366" type="line"/>
-      <point x="467" y="384" type="line"/>
-      <point x="126" y="384" type="line"/>
-      <point x="126" y="676" type="line"/>
-      <point x="491" y="676" type="line"/>
-      <point x="491" y="694" type="line"/>
-      <point x="104" 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/F_ita-cy.glif b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
index 6dba9c60..63e66485 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Fita-cy" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_.glif b/src/Cantarell-Light.ufo/glyphs/G_.glif
index 5043e8a8..567e1ff2 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="344" y="0" name="bottom"/>
-  <anchor x="362" y="694" name="top"/>
+  <anchor x="350" y="0" name="bottom"/>
+  <anchor x="368" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="390" y="-10" type="curve" smooth="yes"/>
-      <point x="479" y="-10"/>
-      <point x="576" y="19"/>
-      <point x="633" y="60" type="curve"/>
-      <point x="633" y="338" type="line"/>
-      <point x="376" y="338" type="line"/>
-      <point x="376" y="319" type="line"/>
-      <point x="611" y="319" type="line"/>
-      <point x="611" y="57" type="line"/>
-      <point x="616" y="69" type="line"/>
-      <point x="553" y="32"/>
-      <point x="466" y="9"/>
-      <point x="393" y="9" type="curve" smooth="yes"/>
-      <point x="208" y="9"/>
-      <point x="87" y="143"/>
-      <point x="87" y="348" type="curve" smooth="yes"/>
-      <point x="87" y="554"/>
-      <point x="209" y="680"/>
-      <point x="406" y="680" type="curve" smooth="yes"/>
-      <point x="475" y="680"/>
-      <point x="548" y="664"/>
-      <point x="598" y="634" type="curve"/>
-      <point x="605" y="651" type="line"/>
-      <point x="551" y="683"/>
-      <point x="482" y="699"/>
-      <point x="409" y="699" type="curve" smooth="yes"/>
-      <point x="196" y="699"/>
-      <point x="64" y="564"/>
-      <point x="64" y="345" type="curve" smooth="yes"/>
-      <point x="64" y="130"/>
-      <point x="193" y="-10"/>
+      <point x="396" y="-10" type="curve" smooth="yes"/>
+      <point x="485" y="-10"/>
+      <point x="582" y="19"/>
+      <point x="639" y="60" type="curve"/>
+      <point x="639" y="338" type="line"/>
+      <point x="382" y="338" type="line"/>
+      <point x="382" y="319" type="line"/>
+      <point x="617" y="319" type="line"/>
+      <point x="617" y="57" type="line"/>
+      <point x="622" y="69" type="line"/>
+      <point x="559" y="32"/>
+      <point x="472" y="9"/>
+      <point x="399" y="9" type="curve" smooth="yes"/>
+      <point x="214" y="9"/>
+      <point x="93" y="143"/>
+      <point x="93" y="348" type="curve" smooth="yes"/>
+      <point x="93" y="554"/>
+      <point x="215" y="680"/>
+      <point x="412" y="680" type="curve" smooth="yes"/>
+      <point x="481" y="680"/>
+      <point x="554" y="664"/>
+      <point x="604" y="634" type="curve"/>
+      <point x="611" y="651" type="line"/>
+      <point x="557" y="683"/>
+      <point x="488" y="699"/>
+      <point x="415" y="699" type="curve" smooth="yes"/>
+      <point x="202" y="699"/>
+      <point x="70" y="564"/>
+      <point x="70" y="345" type="curve" smooth="yes"/>
+      <point x="70" y="130"/>
+      <point x="199" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_breve.glif b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
index eb3b557d..e70e2bed 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="159"/>
+    <component base="brevecomb.case" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_caron.glif b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
index 81df26d0..c6c4d70a 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="187"/>
+    <component base="caroncomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
index 93cb7ab2..b801c2b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="185"/>
+    <component base="circumflexcomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
index c11c4f17..26fb3be7 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="215"/>
+    <component base="commaaccentcomb" xOffset="221"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
index 294cdcd4..dc3b53c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="243"/>
+    <component base="dotaccentcomb.case" xOffset="249"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/G_e-cy.glif
index f6e59cc8..33a401a5 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="503"/>
+  <advance width="519"/>
   <unicode hex="0413"/>
-  <anchor x="146" y="0" name="bottomright"/>
-  <anchor x="259" y="694" name="top"/>
+  <anchor x="162" y="0" name="bottomright"/>
+  <anchor x="275" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="676" type="line"/>
-      <point x="481" y="676" type="line"/>
-      <point x="481" y="694" type="line"/>
-      <point x="104" 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 8da2ff1b..84e14739 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="503"/>
+  <advance width="519"/>
   <unicode hex="04F6"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="descender-cy.case" xOffset="50"/>
+    <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 89086da7..4775d100 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="627"/>
+  <advance width="643"/>
   <unicode hex="0494"/>
   <outline>
     <contour>
-      <point x="247" y="-231" type="line"/>
-      <point x="438" y="-214"/>
-      <point x="565" y="-77"/>
-      <point x="565" y="111" type="curve" smooth="yes"/>
-      <point x="565" y="286"/>
-      <point x="475" y="391"/>
-      <point x="326" y="391" type="curve" smooth="yes"/>
-      <point x="243" y="391"/>
-      <point x="157" y="357"/>
-      <point x="111" y="305" type="curve"/>
-      <point x="121" y="294" type="line"/>
-      <point x="164" y="341"/>
-      <point x="245" y="373"/>
-      <point x="322" y="373" type="curve" smooth="yes"/>
-      <point x="461" y="373"/>
-      <point x="544" y="274"/>
-      <point x="544" y="110" type="curve" smooth="yes"/>
-      <point x="544" y="-68"/>
-      <point x="425" y="-200"/>
-      <point x="246" 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="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="470" y="676" type="line"/>
-      <point x="470" y="694" type="line"/>
-      <point x="104" 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 8e296595..5f5c0e42 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="513"/>
+  <advance width="529"/>
   <unicode hex="0492"/>
   <outline>
     <contour>
-      <point x="129" y="0" type="line"/>
-      <point x="151" y="0" type="line"/>
-      <point x="151" y="676" type="line"/>
-      <point x="491" y="676" type="line"/>
-      <point x="491" y="694" type="line"/>
-      <point x="129" 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="47" y="318" type="line"/>
-      <point x="326" y="318" type="line"/>
-      <point x="326" y="335" type="line"/>
-      <point x="47" 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 9fb40a67..b291bffe 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="498"/>
+  <advance width="514"/>
   <unicode hex="0490"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="676" type="line"/>
-      <point x="476" y="676" type="line"/>
-      <point x="476" y="850" type="line"/>
-      <point x="457" y="850" type="line"/>
-      <point x="457" y="694" type="line"/>
-      <point x="104" 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 fbb3552b..8be3bead 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="503"/>
+  <advance width="519"/>
   <unicode hex="0403"/>
   <outline>
     <component base="Ge-cy"/>
-    <component base="acutecomb.case" xOffset="201"/>
+    <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 024086fd..d5598902 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="703"/>
+  <advance width="725"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="124"/>
+    <component base="macroncomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_.glif b/src/Cantarell-Light.ufo/glyphs/H_.glif
index c5165f6b..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="690"/>
+  <advance width="722"/>
   <unicode hex="0048"/>
   <note>
 H
 </note>
-  <anchor x="347" y="0" name="bottom"/>
-  <anchor x="347" y="534" name="center"/>
-  <anchor x="347" y="694" name="top"/>
-  <anchor x="-4" 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="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="352" type="line"/>
-      <point x="564" y="352" type="line"/>
-      <point x="564" y="0" type="line"/>
-      <point x="586" y="0" type="line"/>
-      <point x="586" y="694" type="line"/>
-      <point x="564" y="694" type="line"/>
-      <point x="564" y="371" type="line"/>
-      <point x="126" y="371" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" 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 3b26a22b..3246b0bf 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="560"/>
+  <advance width="594"/>
   <unicode hex="0425"/>
   <anchor x="537" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_bar.glif b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
index 50fa5a4e..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="690"/>
+  <advance width="722"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-113" 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 082dff15..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="690"/>
+  <advance width="722"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="141"/>
+    <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 dbf51430..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="690"/>
+  <advance width="722"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="170"/>
+    <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 f59a0441..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="690"/>
+  <advance width="722"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="227"/>
+    <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 2685af0a..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="229"/>
+  <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 f3a0fb06..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="229"/>
+  <advance width="261"/>
   <unicode hex="0049"/>
   <note>
 I
 </note>
-  <anchor x="115" y="0" name="bottom"/>
-  <anchor x="119" y="10" name="ogonek"/>
-  <anchor x="115" y="694" name="top"/>
-  <anchor x="-12" 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="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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 a65352e4..f2623d44 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ia-cy" format="2">
-  <advance width="599"/>
+  <advance width="615"/>
   <unicode hex="042F"/>
   <anchor x="300" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_acute.glif b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
index 8c0d712b..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="229"/>
+  <advance width="261"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="57"/>
+    <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 24134a96..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="229"/>
+  <advance width="261"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-88"/>
+    <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 c69c2328..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="229"/>
+  <advance width="261"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-60"/>
+    <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 be3184a4..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="229"/>
+  <advance width="261"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-62"/>
+    <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 fe68c8f7..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="229"/>
+  <advance width="261"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-128"/>
+    <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 fc1b5dbd..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="710"/>
+  <advance width="742"/>
   <unicode hex="04E4"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="dieresiscomb.case" xOffset="135"/>
+    <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 f47d945a..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="229"/>
+  <advance width="261"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-105"/>
+    <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 f2fe1cb4..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="229"/>
+  <advance width="261"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-105"/>
-    <component base="acutecomb.case" xOffset="57" 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 35d285ea..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="229"/>
+  <advance width="261"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="-4"/>
+    <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 cee5a758..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="229"/>
+  <advance width="261"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="-5"/>
+    <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 562ae79c..70f3c2fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="552"/>
+  <advance width="569"/>
   <unicode hex="0415"/>
   <anchor x="277" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
index 44593b86..dcc835ec 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="552"/>
+  <advance width="569"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
index ced2648a..2d3d205d 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="552"/>
+  <advance width="569"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_grave.glif b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
index d935cb8a..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="229"/>
+  <advance width="261"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-82"/>
+    <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 eb0770fd..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="229"/>
+  <advance width="261"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-40"/>
+    <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 4df68d3b..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="710"/>
+  <advance width="742"/>
   <unicode hex="0418"/>
-  <anchor x="696" y="0" name="bottomright"/>
-  <anchor x="355" y="694" name="top"/>
+  <anchor x="712" y="0" name="bottomright"/>
+  <anchor x="371" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="131" y="0" type="line"/>
-      <point x="587" y="674" type="line"/>
-      <point x="586" y="674" type="line"/>
-      <point x="586" y="0" type="line"/>
-      <point x="606" y="0" type="line"/>
-      <point x="606" y="694" type="line"/>
-      <point x="579" y="694" type="line"/>
-      <point x="122" y="20" type="line"/>
-      <point x="124" y="20" type="line"/>
-      <point x="124" y="694" type="line"/>
-      <point x="104" 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 bcb36dbf..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="710"/>
+  <advance width="742"/>
   <unicode hex="040D"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="gravecomb.case" xOffset="158"/>
+    <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 86e2c492..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="229"/>
+  <advance width="261"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-91"/>
+    <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 1464b75c..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="710"/>
+  <advance width="742"/>
   <unicode hex="0419"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="brevecomb-cy.case" xOffset="162"/>
+    <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 dcc9547b..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="710"/>
+  <advance width="742"/>
   <unicode hex="04E2"/>
   <outline>
     <component base="Ii-cy"/>
-    <component base="macroncomb.case" xOffset="117"/>
+    <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 b1812f11..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="229"/>
+  <advance width="261"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-97"/>
+    <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 7b805158..a4b34e02 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="552"/>
+  <advance width="569"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
index 3a74af39..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="229"/>
+  <advance width="261"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-257"/>
+    <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 c2063268..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="229"/>
+  <advance width="261"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-129"/>
+    <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 4ad86ba2..aa0405ce 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="945"/>
+  <advance width="967"/>
   <unicode hex="042E"/>
-  <anchor x="474" y="694" name="top"/>
+  <anchor x="490" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="575" y="-10" type="curve" smooth="yes"/>
-      <point x="757" y="-10"/>
-      <point x="881" y="134"/>
-      <point x="881" y="347" type="curve" smooth="yes"/>
-      <point x="881" y="558"/>
-      <point x="760" y="699"/>
-      <point x="579" y="699" type="curve" smooth="yes"/>
-      <point x="401" y="699"/>
-      <point x="290" y="562"/>
-      <point x="290" y="343" type="curve" smooth="yes"/>
-      <point x="290" y="125"/>
-      <point x="399" 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="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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="119" y="352" type="line"/>
-      <point x="303" y="352" type="line"/>
-      <point x="303" y="371" type="line"/>
-      <point x="119" 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="578" y="9" type="curve" smooth="yes"/>
-      <point x="413" y="9"/>
-      <point x="311" y="137"/>
-      <point x="311" y="346" type="curve" smooth="yes"/>
-      <point x="311" y="556"/>
-      <point x="409" y="680"/>
-      <point x="575" y="680" type="curve" smooth="yes"/>
-      <point x="744" y="680"/>
-      <point x="859" y="543"/>
-      <point x="859" y="342" type="curve" smooth="yes"/>
-      <point x="859" y="142"/>
-      <point x="746" 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/I_zhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
index d244bd6c..bf405ac2 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_zhitsa-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Izhitsa-cy" format="2">
-  <advance width="664"/>
+  <advance width="672"/>
   <unicode hex="0474"/>
   <outline>
     <contour>
-      <point x="277" y="0" type="line"/>
-      <point x="288" y="0" type="line"/>
-      <point x="475" y="532" type="line" smooth="yes"/>
-      <point x="512" y="638"/>
-      <point x="560" y="687"/>
-      <point x="626" y="687" type="curve"/>
-      <point x="625" y="707" type="line"/>
-      <point x="552" y="707"/>
-      <point x="494" y="648"/>
-      <point x="454" y="533" type="curve" smooth="yes"/>
-      <point x="279" y="30" type="line"/>
-      <point x="288" y="30" type="line"/>
-      <point x="41" y="694" type="line"/>
-      <point x="18" y="694" type="line"/>
+      <point x="285" y="0" type="line"/>
+      <point x="296" y="0" type="line"/>
+      <point x="483" y="532" type="line" smooth="yes"/>
+      <point x="520" y="638"/>
+      <point x="568" y="687"/>
+      <point x="634" y="687" type="curve"/>
+      <point x="633" y="707" type="line"/>
+      <point x="560" y="707"/>
+      <point x="502" y="648"/>
+      <point x="462" y="533" type="curve" smooth="yes"/>
+      <point x="287" y="30" type="line"/>
+      <point x="296" y="30" type="line"/>
+      <point x="49" y="694" type="line"/>
+      <point x="26" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/J_.glif b/src/Cantarell-Light.ufo/glyphs/J_.glif
index 9fa079f4..4a7470cc 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="370"/>
+  <advance width="393"/>
   <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 37cc1c3b..9de51a80 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="370"/>
+  <advance width="393"/>
   <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 323b4be2..464c18c5 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="370"/>
+  <advance width="393"/>
   <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 7b237716..dadb1602 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="370"/>
+  <advance width="393"/>
   <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 29aa9abc..c98419d8 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="541"/>
+  <advance width="553"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="277" y="0" name="bottom"/>
-  <anchor x="277" y="694" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="491" y="0" type="line"/>
-      <point x="521" y="0" type="line"/>
-      <point x="145" y="366" type="line"/>
-      <point x="145" y="356" type="line"/>
-      <point x="507" y="694" type="line"/>
-      <point x="478" y="694" type="line"/>
-      <point x="126" y="360" type="line"/>
+      <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="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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 617c8d04..394952c0 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="602"/>
+  <advance width="618"/>
   <unicode hex="041A"/>
-  <anchor x="569" y="0" name="bottomright"/>
-  <anchor x="303" y="694" name="top"/>
+  <anchor x="585" y="0" name="bottomright"/>
+  <anchor x="319" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="549" y="0" type="line"/>
-      <point x="574" y="0" type="line"/>
-      <point x="279" y="364" type="line"/>
-      <point x="279" y="353" type="line"/>
-      <point x="559" y="694" type="line"/>
-      <point x="535" y="694" type="line"/>
-      <point x="260" 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="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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="113" y="348" type="line"/>
-      <point x="274" y="348" type="line"/>
-      <point x="274" y="366" type="line"/>
-      <point x="113" 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 b86d0ac4..84019bbd 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="541"/>
+  <advance width="553"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="219"/>
+    <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 3cc208d3..d4f23b1b 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_adescender-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="049A"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="descender-cy.case" xOffset="473"/>
+    <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 6abda31f..87e6f468 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="598"/>
+  <advance width="614"/>
   <unicode hex="049C"/>
   <outline>
     <contour>
-      <point x="545" y="0" type="line"/>
-      <point x="570" y="0" type="line"/>
-      <point x="295" y="364" type="line"/>
-      <point x="295" y="353" type="line"/>
-      <point x="555" y="694" type="line"/>
-      <point x="531" y="694" type="line"/>
-      <point x="276" 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="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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="113" y="348" type="line"/>
-      <point x="290" y="348" type="line"/>
-      <point x="290" y="366" type="line"/>
-      <point x="113" 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="217" y="178" type="line"/>
-      <point x="237" y="178" type="line"/>
-      <point x="237" y="538" type="line"/>
-      <point x="217" 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 14fe115f..0c90eb20 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="541"/>
+  <advance width="553"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="148"/>
+    <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 8d0cb31f..8aaa1574 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="602"/>
+  <advance width="618"/>
   <unicode hex="040C"/>
   <outline>
     <component base="Ka-cy"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <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 e8dd623b..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="470"/>
+  <advance width="499"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="280" y="0" name="bottom"/>
-  <anchor x="156" y="367" name="center"/>
-  <anchor x="496" y="352" name="periodcentered"/>
-  <anchor x="116" y="694" name="top"/>
-  <anchor x="245" y="480" name="topright"/>
+  <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="104" y="0" type="line"/>
-      <point x="450" y="0" type="line"/>
-      <point x="450" y="19" type="line"/>
-      <point x="125" y="19" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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 27583484..ee6c1e4d 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="840"/>
+  <advance width="892"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="470"/>
+    <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 b400ff1d..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="470"/>
+  <advance width="499"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="58"/>
+    <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 f341a4c2..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="470"/>
+  <advance width="499"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="133"/>
+    <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 325e9898..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="470"/>
+  <advance width="499"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="151"/>
+    <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 f0f5caf2..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="470"/>
+  <advance width="499"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="496"/>
+    <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 cb566e70..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="470"/>
+  <advance width="499"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="160"/>
+    <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 a098a5b3..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="691"/>
+  <advance width="734"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="470"/>
+    <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 66cafb73..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="470"/>
+  <advance width="499"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="30"/>
+    <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 20fcb3d4..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="470"/>
+  <advance width="499"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-20" 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 9e445362..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="823"/>
+  <advance width="855"/>
   <unicode hex="004D"/>
   <note>
 M
 </note>
-  <anchor x="426" y="0" name="bottom"/>
-  <anchor x="426" y="694" name="top"/>
+  <anchor x="442" y="0" name="bottom"/>
+  <anchor x="442" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="677" type="line"/>
-      <point x="118" y="677" type="line"/>
-      <point x="398" y="108" type="line"/>
-      <point x="418" y="108" type="line"/>
-      <point x="705" y="676" type="line"/>
-      <point x="698" y="676" type="line"/>
-      <point x="698" y="0" type="line"/>
-      <point x="719" y="0" type="line"/>
-      <point x="719" y="694" type="line"/>
-      <point x="693" y="694" type="line"/>
-      <point x="404" y="118" type="line"/>
-      <point x="415" y="118" type="line"/>
-      <point x="132" y="694" type="line"/>
-      <point x="104" 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 136bd6e7..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="823"/>
+  <advance width="855"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="306"/>
+    <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 e2db388e..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="720"/>
+  <advance width="752"/>
   <unicode hex="004E"/>
   <note>
 N
 </note>
-  <anchor x="371" y="0" name="bottom"/>
-  <anchor x="371" y="694" name="top"/>
+  <anchor x="387" y="0" name="bottom"/>
+  <anchor x="387" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="674" type="line"/>
-      <point x="123" y="674" type="line"/>
-      <point x="589" y="0" type="line"/>
-      <point x="616" y="0" type="line"/>
-      <point x="616" y="694" type="line"/>
-      <point x="596" y="694" type="line"/>
-      <point x="596" y="20" type="line"/>
-      <point x="599" y="20" type="line"/>
-      <point x="133" y="694" type="line"/>
-      <point x="104" 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="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 0bff69da..b74fe4ad 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="1090"/>
+  <advance width="1145"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="720"/>
+    <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 74752d13..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="720"/>
+  <advance width="752"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="313"/>
+    <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 b0628dd7..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="720"/>
+  <advance width="752"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="196"/>
+    <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 551d8353..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="720"/>
+  <advance width="752"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="242"/>
+    <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 a2c11e87..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="720"/>
+  <advance width="752"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="252"/>
+    <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 cbcf0d00..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="720"/>
+  <advance width="752"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="251"/>
+    <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 b66f4942..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="941"/>
+  <advance width="987"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="720"/>
+    <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 0db93736..9409013a 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="1059"/>
+  <advance width="1075"/>
   <unicode hex="040A"/>
   <outline>
     <contour>
-      <point x="576" y="0" type="line"/>
-      <point x="771" y="0" type="line" smooth="yes"/>
-      <point x="914" y="0"/>
-      <point x="999" y="73"/>
-      <point x="999" y="200" type="curve" smooth="yes"/>
-      <point x="999" y="322"/>
-      <point x="921" y="403"/>
-      <point x="805" y="403" type="curve" smooth="yes"/>
-      <point x="581" y="403" type="line"/>
-      <point x="581" y="386" type="line"/>
-      <point x="795" y="386" type="line" smooth="yes"/>
-      <point x="902" y="386"/>
-      <point x="977" y="312"/>
-      <point x="977" y="195" type="curve" smooth="yes"/>
-      <point x="977" y="82"/>
-      <point x="907" y="18"/>
-      <point x="782" y="18" type="curve" smooth="yes"/>
-      <point x="576" 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="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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="119" y="352" type="line"/>
-      <point x="570" y="352" type="line"/>
-      <point x="570" y="371" type="line"/>
-      <point x="119" 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="564" y="0" type="line"/>
-      <point x="586" y="0" type="line"/>
-      <point x="586" y="694" type="line"/>
-      <point x="564" 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 6fda899c..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="720"/>
+  <advance width="752"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="121"/>
+    <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 6ea9512d..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="720"/>
+  <advance width="752"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="127"/>
+    <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 293e04ed..72e3a302 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="041E"/>
   <anchor x="377" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_.glif b/src/Cantarell-Light.ufo/glyphs/O_.glif
index df27c2ee..518466ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="004F"/>
   <note>
 O
 </note>
-  <anchor x="591" y="94" name="Qtail"/>
-  <anchor x="371" y="0" name="bottom"/>
-  <anchor x="372" y="345" name="center"/>
-  <anchor x="452" y="10" name="ogonek"/>
-  <anchor x="371" y="694" name="top"/>
-  <anchor x="-10" y="694" name="topleft"/>
-  <anchor x="646" y="694" name="topright"/>
+  <anchor x="597" y="94" name="Qtail"/>
+  <anchor x="377" y="0" name="bottom"/>
+  <anchor x="378" y="345" name="center"/>
+  <anchor x="458" y="10" name="ogonek"/>
+  <anchor x="377" y="694" name="top"/>
+  <anchor x="-4" y="694" name="topleft"/>
+  <anchor x="652" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="369" y="-10" type="curve" smooth="yes"/>
-      <point x="552" y="-10"/>
-      <point x="675" y="135"/>
-      <point x="675" y="346" type="curve" smooth="yes"/>
-      <point x="675" y="558"/>
-      <point x="554" y="699"/>
-      <point x="372" y="699" type="curve" smooth="yes"/>
-      <point x="187" y="699"/>
-      <point x="64" y="553"/>
-      <point x="64" y="343" type="curve" smooth="yes"/>
-      <point x="64" y="133"/>
-      <point x="186" y="-10"/>
+      <point x="375" y="-10" type="curve" smooth="yes"/>
+      <point x="558" y="-10"/>
+      <point x="681" y="135"/>
+      <point x="681" y="346" type="curve" smooth="yes"/>
+      <point x="681" y="558"/>
+      <point x="560" y="699"/>
+      <point x="378" y="699" type="curve" smooth="yes"/>
+      <point x="193" y="699"/>
+      <point x="70" y="553"/>
+      <point x="70" y="343" type="curve" smooth="yes"/>
+      <point x="70" y="133"/>
+      <point x="192" y="-10"/>
     </contour>
     <contour>
-      <point x="371" y="9" type="curve" smooth="yes"/>
-      <point x="200" y="9"/>
-      <point x="86" y="147"/>
-      <point x="86" y="346" type="curve" smooth="yes"/>
-      <point x="86" y="545"/>
-      <point x="199" y="680"/>
-      <point x="369" y="680" type="curve" smooth="yes"/>
-      <point x="539" y="680"/>
-      <point x="653" y="542"/>
-      <point x="653" y="343" type="curve" smooth="yes"/>
-      <point x="653" y="143"/>
-      <point x="541" y="9"/>
+      <point x="377" y="9" type="curve" smooth="yes"/>
+      <point x="206" y="9"/>
+      <point x="92" y="147"/>
+      <point x="92" y="346" type="curve" smooth="yes"/>
+      <point x="92" y="545"/>
+      <point x="205" y="680"/>
+      <point x="375" y="680" type="curve" smooth="yes"/>
+      <point x="545" y="680"/>
+      <point x="659" y="542"/>
+      <point x="659" y="343" type="curve" smooth="yes"/>
+      <point x="659" y="143"/>
+      <point x="547" y="9"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_E_.glif b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
index 71d946c3..14a43b3e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="950"/>
+  <advance width="957"/>
   <unicode hex="0152"/>
-  <anchor x="526" y="0" name="bottom"/>
-  <anchor x="526" y="694" name="top"/>
+  <anchor x="532" y="0" name="bottom"/>
+  <anchor x="532" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="419" y="-10" type="curve" smooth="yes"/>
-      <point x="451" y="-10"/>
-      <point x="500" y="-6"/>
-      <point x="531" y="0" type="curve"/>
-      <point x="526" y="18" type="line"/>
-      <point x="499" y="12"/>
-      <point x="451" y="9"/>
-      <point x="421" y="9" type="curve" smooth="yes"/>
-      <point x="220" y="9"/>
-      <point x="86" y="145"/>
-      <point x="86" y="346" type="curve" smooth="yes"/>
-      <point x="86" y="547"/>
-      <point x="220" y="680"/>
-      <point x="419" y="680" type="curve" smooth="yes"/>
-      <point x="447" y="680"/>
-      <point x="494" y="677"/>
-      <point x="521" y="672" type="curve"/>
-      <point x="525" y="691" type="line"/>
-      <point x="497" y="696"/>
-      <point x="451" y="699"/>
-      <point x="423" y="699" type="curve" smooth="yes"/>
-      <point x="208" y="699"/>
-      <point x="64" y="555"/>
-      <point x="64" y="343" type="curve" smooth="yes"/>
-      <point x="64" y="131"/>
-      <point x="207" y="-10"/>
+      <point x="425" y="-10" type="curve" smooth="yes"/>
+      <point x="457" y="-10"/>
+      <point x="506" y="-6"/>
+      <point x="537" y="0" type="curve"/>
+      <point x="532" y="18" type="line"/>
+      <point x="505" y="12"/>
+      <point x="457" y="9"/>
+      <point x="427" y="9" type="curve" smooth="yes"/>
+      <point x="226" y="9"/>
+      <point x="92" y="145"/>
+      <point x="92" y="346" type="curve" smooth="yes"/>
+      <point x="92" y="547"/>
+      <point x="226" y="680"/>
+      <point x="425" y="680" type="curve" smooth="yes"/>
+      <point x="453" y="680"/>
+      <point x="500" y="677"/>
+      <point x="527" y="672" type="curve"/>
+      <point x="531" y="691" type="line"/>
+      <point x="503" y="696"/>
+      <point x="457" y="699"/>
+      <point x="429" y="699" type="curve" smooth="yes"/>
+      <point x="214" y="699"/>
+      <point x="70" y="555"/>
+      <point x="70" y="343" type="curve" smooth="yes"/>
+      <point x="70" y="131"/>
+      <point x="213" y="-10"/>
     </contour>
     <contour>
-      <point x="502" y="0" type="line"/>
-      <point x="896" y="0" type="line"/>
-      <point x="896" y="18" type="line"/>
-      <point x="523" y="18" type="line"/>
-      <point x="523" y="351" type="line"/>
-      <point x="871" y="351" type="line"/>
-      <point x="871" y="369" type="line"/>
-      <point x="523" y="369" type="line"/>
-      <point x="523" y="676" type="line"/>
-      <point x="896" y="676" type="line"/>
-      <point x="896" y="694" type="line"/>
-      <point x="502" y="694" type="line"/>
+      <point x="508" y="0" type="line"/>
+      <point x="902" y="0" type="line"/>
+      <point x="902" y="18" type="line"/>
+      <point x="529" y="18" type="line"/>
+      <point x="529" y="351" type="line"/>
+      <point x="877" y="351" type="line"/>
+      <point x="877" y="369" type="line"/>
+      <point x="529" y="369" type="line"/>
+      <point x="529" y="676" type="line"/>
+      <point x="902" y="676" type="line"/>
+      <point x="902" y="694" type="line"/>
+      <point x="508" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_acute.glif b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
index 515c8c98..a01a36cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="313"/>
+    <component base="acutecomb.case" xOffset="319"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
index 31ebf853..756296b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obarred-cy" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-88" yOffset="3"/>
+    <component base="_bar-cy" xOffset="-82" yOffset="3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_breve.glif b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
index 8001d2dc..67c8ffca 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="168"/>
+    <component base="brevecomb.case" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_caron.glif b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
index e0827090..2f4708ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="196"/>
+    <component base="caroncomb.case" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
index c45a3b55..f279c66c 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="circumflexcomb.case" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
index 1c071ae6..b1d72adc 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="195" yOffset="214"/>
-    <component base="acutecomb.loclVIET" xOffset="414" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="201" yOffset="214"/>
+    <component base="acutecomb.loclVIET" xOffset="420" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
index 355fa031..bb998666 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="251"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="dotbelowcomb" xOffset="257"/>
+    <component base="circumflexcomb.case" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
index 92f74959..810cf223 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="195" yOffset="214"/>
-    <component base="gravecomb.loclVIET" xOffset="310" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="201" yOffset="214"/>
+    <component base="gravecomb.loclVIET" xOffset="316" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
index 6fe17c10..e4b953fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="195" yOffset="214"/>
-    <component base="hookabovecomb.loclVIET" xOffset="341" yOffset="288"/>
+    <component base="circumflexcomb.loclVIET" xOffset="201" yOffset="214"/>
+    <component base="hookabovecomb.loclVIET" xOffset="347" yOffset="288"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
index 582d1728..4272be05 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="195" yOffset="214"/>
-    <component base="tildecomb.loclVIET" xOffset="144" yOffset="294"/>
+    <component base="circumflexcomb.loclVIET" xOffset="201" yOffset="214"/>
+    <component base="tildecomb.loclVIET" xOffset="150" yOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
index 56fe3315..f8c8fa77 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="128"/>
+    <component base="dblgravecomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
index 06dd166d..2f7e529b 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
index cd007cde..579d53fb 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="151"/>
+    <component base="dieresiscomb.case" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
index 46d6cda6..3e92e07c 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="151"/>
-    <component base="macroncomb.case" xOffset="133" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="157"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
index 3512f5a8..ffe516b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="252"/>
-    <component base="macroncomb.case" xOffset="133" yOffset="143"/>
+    <component base="dotaccentcomb.case" xOffset="258"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
index 80b2d31d..5417e62a 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="dotbelowcomb" xOffset="257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_grave.glif b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
index e5f4a42b..1d7b10e0 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="174"/>
+    <component base="gravecomb.case" xOffset="180"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
index 25c38cb2..4a8c5003 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="216"/>
+    <component base="hookabovecomb.case" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horn.glif b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
index e1f73332..e8acd414 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="514" yOffset="212"/>
+    <component base="horncomb" xOffset="520" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
index a9f799b3..0e09a343 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="313"/>
+    <component base="acutecomb.case" xOffset="319"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
index 7d64cf1f..1527c224 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="dotbelowcomb" xOffset="257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
index 3bf4d6cc..30067aa7 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="174"/>
+    <component base="gravecomb.case" xOffset="180"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
index 9072f6e4..c077d189 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="216"/>
+    <component base="hookabovecomb.case" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
index 385ef4aa..a3dcddcd 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="761"/>
+  <advance width="773"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="127"/>
+    <component base="tildecomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
index 3067320d..ae076167 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="199"/>
+    <component base="hungarumlautcomb.case" xOffset="205"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
index c9262917..da944051 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="165"/>
+    <component base="breveinvertedcomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macron.glif b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
index 4834706a..ad815e8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="133"/>
+    <component base="macroncomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
index 94092d5a..6ab79727 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="133"/>
-    <component base="acutecomb.case" xOffset="313" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="139"/>
+    <component base="acutecomb.case" xOffset="319" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
index 2cf36376..863995b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="133"/>
-    <component base="gravecomb.case" xOffset="174" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="139"/>
+    <component base="gravecomb.case" xOffset="180" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
index 0907ac17..cecc1a2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="51"/>
+    <component base="ogonekcomb.tall.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slash.glif b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
index ac427419..de53428f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="83" yOffset="-21"/>
+    <component base="slashlongcomb.case" xOffset="89" yOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
index 1aec0aa8..a1dcdbeb 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="313"/>
+    <component base="acutecomb.case" xOffset="319"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
index 7adc0792..71fbc1ce 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="127"/>
+    <component base="tildecomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
index a3646bfd..aef4d90a 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="127"/>
-    <component base="acutecomb.case" xOffset="313" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="133"/>
+    <component base="acutecomb.case" xOffset="319" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
index e8629444..8c37c22f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="127"/>
-    <component base="dieresiscomb.case" xOffset="151" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="133"/>
+    <component base="dieresiscomb.case" xOffset="157" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
index 43311310..5be6d0c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="739"/>
+  <advance width="751"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="127"/>
-    <component base="macroncomb.case" xOffset="133" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="133"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index 5350ea99..fc0d33c2 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="556"/>
+  <advance width="579"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="312" y="0" name="bottom"/>
-  <anchor x="312" y="694" name="top"/>
+  <anchor x="328" y="0" name="bottom"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="280" y="676" type="line" smooth="yes"/>
-      <point x="402" y="676"/>
-      <point x="484" y="597"/>
-      <point x="484" y="475" type="curve" smooth="yes"/>
-      <point x="484" y="358"/>
-      <point x="410" y="286"/>
-      <point x="286" y="286" type="curve" smooth="yes"/>
-      <point x="119" y="286" type="line"/>
-      <point x="119" y="268" type="line"/>
-      <point x="280" y="268" type="line" smooth="yes"/>
-      <point x="416" y="268"/>
-      <point x="506" y="353"/>
-      <point x="506" y="480" type="curve" smooth="yes"/>
-      <point x="506" y="608"/>
-      <point x="418" y="694"/>
-      <point x="286" y="694" type="curve" smooth="yes"/>
-      <point x="104" 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 d4c4095a..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="229"/>
+  <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 023bbf6f..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="659"/>
+  <advance width="691"/>
   <unicode hex="041F"/>
-  <anchor x="645" y="0" name="bottomright"/>
+  <anchor x="661" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="534" y="676" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="555" y="0" type="line"/>
-      <point x="555" y="694" type="line"/>
-      <point x="104" 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 7542c691..09035c2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="741"/>
+  <advance width="770"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
+  <anchor x="376" y="0" name="bottom"/>
+  <anchor x="376" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="369" y="-10" type="curve" smooth="yes"/>
-      <point x="552" y="-10"/>
-      <point x="675" y="135"/>
-      <point x="675" y="346" type="curve" smooth="yes"/>
-      <point x="675" y="558"/>
-      <point x="554" y="699"/>
-      <point x="372" y="699" type="curve" smooth="yes"/>
-      <point x="187" y="699"/>
-      <point x="64" y="553"/>
-      <point x="64" y="343" type="curve" smooth="yes"/>
-      <point x="64" y="133"/>
-      <point x="186" y="-10"/>
+      <point x="375" y="-10" type="curve" smooth="yes"/>
+      <point x="558" y="-10"/>
+      <point x="681" y="135"/>
+      <point x="681" y="346" type="curve" smooth="yes"/>
+      <point x="681" y="558"/>
+      <point x="560" y="699"/>
+      <point x="378" y="699" type="curve" smooth="yes"/>
+      <point x="193" y="699"/>
+      <point x="70" y="553"/>
+      <point x="70" y="343" type="curve" smooth="yes"/>
+      <point x="70" y="133"/>
+      <point x="192" y="-10"/>
     </contour>
     <contour>
-      <point x="684" y="-13" type="line"/>
-      <point x="697" y="1" type="line"/>
-      <point x="407" y="287" type="line"/>
-      <point x="396" y="274" type="line"/>
+      <point x="690" y="-13" type="line"/>
+      <point x="703" y="1" type="line"/>
+      <point x="413" y="287" type="line"/>
+      <point x="402" y="274" type="line"/>
     </contour>
     <contour>
-      <point x="371" y="9" type="curve" smooth="yes"/>
-      <point x="200" y="9"/>
-      <point x="86" y="147"/>
-      <point x="86" y="346" type="curve" smooth="yes"/>
-      <point x="86" y="545"/>
-      <point x="199" y="680"/>
-      <point x="369" y="680" type="curve" smooth="yes"/>
-      <point x="539" y="680"/>
-      <point x="653" y="542"/>
-      <point x="653" y="343" type="curve" smooth="yes"/>
-      <point x="653" y="143"/>
-      <point x="541" y="9"/>
+      <point x="377" y="9" type="curve" smooth="yes"/>
+      <point x="206" y="9"/>
+      <point x="92" y="147"/>
+      <point x="92" y="346" type="curve" smooth="yes"/>
+      <point x="92" y="545"/>
+      <point x="205" y="680"/>
+      <point x="375" y="680" type="curve" smooth="yes"/>
+      <point x="545" y="680"/>
+      <point x="659" y="542"/>
+      <point x="659" y="343" type="curve" smooth="yes"/>
+      <point x="659" y="143"/>
+      <point x="547" y="9"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Light.ufo/glyphs/Q_a-cy.glif
index c292186f..3f6c6e8f 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="741"/>
+  <advance width="770"/>
   <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 027b1aff..e885663c 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="593"/>
+  <advance width="618"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="298" y="0" name="bottom"/>
-  <anchor x="270" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="286" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="676" type="line"/>
-      <point x="277" y="676" type="line" smooth="yes"/>
-      <point x="413" y="676"/>
-      <point x="487" y="616"/>
-      <point x="487" y="500" type="curve" smooth="yes"/>
-      <point x="487" y="389"/>
-      <point x="417" y="329"/>
-      <point x="284" y="329" type="curve" smooth="yes"/>
-      <point x="115" y="329" type="line"/>
-      <point x="115" y="311" type="line"/>
-      <point x="277" y="311" type="line" smooth="yes"/>
-      <point x="427" y="311"/>
-      <point x="509" y="381"/>
-      <point x="509" y="506" type="curve" smooth="yes"/>
-      <point x="509" y="628"/>
-      <point x="427" y="694"/>
-      <point x="282" y="694" type="curve" smooth="yes"/>
-      <point x="104" 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="525" y="0" type="line"/>
-      <point x="551" y="0" type="line"/>
-      <point x="366" y="325" type="line"/>
-      <point x="343" y="325" type="line"/>
+      <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 ccde286b..c4c98919 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="593"/>
+  <advance width="618"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="212"/>
+    <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 858eee2f..951df7a4 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="593"/>
+  <advance width="618"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="95"/>
+    <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 8b8ae3f7..c349a95e 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="593"/>
+  <advance width="618"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="169"/>
+    <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 855ef663..85825257 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="593"/>
+  <advance width="618"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="27"/>
+    <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 6bbbd8ce..a3085b67 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="593"/>
+  <advance width="618"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="178"/>
+    <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 020f96f2..ee052ccd 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="593"/>
+  <advance width="618"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="64"/>
+    <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 e8d79346..6d95d7fc 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="593"/>
+  <advance width="618"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="48"/>
+    <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 1ec2cafc..756ae4d1 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="553"/>
+  <advance width="574"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="270" y="0" name="bottom"/>
-  <anchor x="275" y="694" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="285" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="270" y="-10" type="curve" smooth="yes"/>
-      <point x="413" y="-10"/>
-      <point x="503" y="66"/>
-      <point x="503" y="177" type="curve" smooth="yes"/>
-      <point x="503" y="416"/>
-      <point x="84" y="307"/>
-      <point x="84" y="531" type="curve" smooth="yes"/>
-      <point x="84" y="627"/>
-      <point x="160" y="683"/>
-      <point x="290" y="683" type="curve" smooth="yes"/>
-      <point x="350" y="683"/>
-      <point x="411" y="671"/>
-      <point x="464" y="645" type="curve"/>
-      <point x="471" y="663" type="line"/>
-      <point x="418" y="691"/>
-      <point x="355" y="702"/>
-      <point x="296" y="702" type="curve" smooth="yes"/>
-      <point x="150" y="702"/>
-      <point x="62" y="636"/>
-      <point x="62" y="527" type="curve" smooth="yes"/>
-      <point x="62" y="290"/>
-      <point x="481" y="394"/>
-      <point x="481" y="172" type="curve" smooth="yes"/>
-      <point x="481" y="75"/>
-      <point x="402" y="9"/>
-      <point x="275" y="9" type="curve" smooth="yes"/>
-      <point x="208" y="9"/>
-      <point x="133" y="27"/>
-      <point x="61" y="60" type="curve"/>
-      <point x="54" y="41" type="line"/>
-      <point x="123" y="8"/>
-      <point x="201" y="-10"/>
+      <point x="280" y="-10" type="curve" smooth="yes"/>
+      <point x="423" y="-10"/>
+      <point x="513" y="66"/>
+      <point x="513" y="177" type="curve" smooth="yes"/>
+      <point x="513" y="416"/>
+      <point x="94" y="307"/>
+      <point x="94" y="531" type="curve" smooth="yes"/>
+      <point x="94" y="627"/>
+      <point x="170" y="683"/>
+      <point x="300" y="683" type="curve" smooth="yes"/>
+      <point x="360" y="683"/>
+      <point x="421" y="671"/>
+      <point x="474" y="645" type="curve"/>
+      <point x="481" y="663" type="line"/>
+      <point x="428" y="691"/>
+      <point x="365" y="702"/>
+      <point x="306" y="702" type="curve" smooth="yes"/>
+      <point x="160" y="702"/>
+      <point x="72" y="636"/>
+      <point x="72" y="527" type="curve" smooth="yes"/>
+      <point x="72" y="290"/>
+      <point x="491" y="394"/>
+      <point x="491" y="172" type="curve" smooth="yes"/>
+      <point x="491" y="75"/>
+      <point x="412" y="9"/>
+      <point x="285" y="9" type="curve" smooth="yes"/>
+      <point x="218" y="9"/>
+      <point x="143" y="27"/>
+      <point x="71" y="60" type="curve"/>
+      <point x="64" y="41" type="line"/>
+      <point x="133" y="8"/>
+      <point x="211" 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 b1e699e2..74637d57 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="553"/>
+  <advance width="574"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="217"/>
+    <component base="acutecomb.case" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_acutedotaccent.glif
index b6baf5da..05ca4d30 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="553"/>
+  <advance width="574"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="217"/>
-    <component base="dotaccentcomb.case" xOffset="151" yOffset="70"/>
+    <component base="acutecomb.case" xOffset="227"/>
+    <component base="dotaccentcomb.case" xOffset="161" 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 494b23be..f7db61d2 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="233"/>
+  <advance width="265"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="15" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="31" 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 4074cc40..bcdc7fc5 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="553"/>
+  <advance width="574"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="100"/>
+    <component base="caroncomb.case" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_carondotaccent.glif
index 4c7cf598..01b56e39 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="553"/>
+  <advance width="574"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="100"/>
-    <component base="dotaccentcomb.case" xOffset="156" yOffset="109"/>
+    <component base="caroncomb.case" xOffset="110"/>
+    <component base="dotaccentcomb.case" xOffset="166" 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 8fc1a734..940b1e61 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="553"/>
+  <advance width="574"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="145"/>
+    <component base="cedillacomb" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
index 2ee0a66c..0b3c0462 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa-cy" format="2">
-  <advance width="729"/>
+  <advance width="735"/>
   <unicode hex="04D8"/>
   <outline>
     <component base="Schwa"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
index c878e364..aa49c996 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="729"/>
+  <advance width="735"/>
   <unicode hex="018F"/>
   <anchor x="369" y="0" name="bottom"/>
   <anchor x="369" y="694" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/S_circumflex.glif
index a621e59e..f166e7f9 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="553"/>
+  <advance width="574"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="98"/>
+    <component base="circumflexcomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_commaaccent.glif
index e12cd4dc..d736da9e 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="553"/>
+  <advance width="574"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="141"/>
+    <component base="commaaccentcomb" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/S_dotaccent.glif
index a40b24a7..87855657 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="553"/>
+  <advance width="574"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="156"/>
+    <component base="dotaccentcomb.case" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/S_dotbelow.glif
index ab660ab1..73064606 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="553"/>
+  <advance width="574"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="150"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/S_dotbelowdotaccent.glif
index c33df8fc..017c9223 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="553"/>
+  <advance width="574"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="150"/>
-    <component base="dotaccentcomb.case" xOffset="156"/>
+    <component base="dotbelowcomb" xOffset="160"/>
+    <component base="dotaccentcomb.case" xOffset="166"/>
   </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 cecce38b..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="942"/>
+  <advance width="974"/>
   <unicode hex="0428"/>
-  <anchor x="858" y="0" name="bottomright"/>
+  <anchor x="874" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="838" y="0" type="line"/>
-      <point x="838" y="694" type="line"/>
-      <point x="816" y="694" type="line"/>
-      <point x="816" y="19" type="line"/>
-      <point x="126" y="19" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" 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="468" y="10" type="line"/>
-      <point x="490" y="10" type="line"/>
-      <point x="490" y="694" type="line"/>
-      <point x="468" 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 5d82f519..66678880 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="945"/>
+  <advance width="961"/>
   <unicode hex="0429"/>
   <outline>
     <component base="Sha-cy"/>
-    <component base="descender-cy.case" xOffset="762"/>
+    <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 fbb07b8f..af95442a 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="612"/>
+  <advance width="628"/>
   <unicode hex="04BA"/>
   <outline>
     <contour>
-      <point x="520" y="0" type="line"/>
-      <point x="541" y="0" type="line"/>
-      <point x="541" y="239" type="line" smooth="yes"/>
-      <point x="541" y="346"/>
-      <point x="468" y="411"/>
-      <point x="334" y="411" type="curve" smooth="yes"/>
-      <point x="247" y="411"/>
-      <point x="158" y="384"/>
-      <point x="104" y="345" type="curve"/>
-      <point x="114" y="334" type="line"/>
-      <point x="162" y="367"/>
-      <point x="250" y="393"/>
-      <point x="331" y="393" type="curve" smooth="yes"/>
-      <point x="452" y="393"/>
-      <point x="520" y="336"/>
-      <point x="520" 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="105" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="105" 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 d31cef79..20eaebc3 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="591"/>
+  <advance width="607"/>
   <unicode hex="042C"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="306" y="0" type="line" smooth="yes"/>
-      <point x="447" y="0"/>
-      <point x="531" y="74"/>
-      <point x="531" y="200" type="curve" smooth="yes"/>
-      <point x="531" y="322"/>
-      <point x="454" y="403"/>
-      <point x="339" y="403" type="curve" smooth="yes"/>
-      <point x="118" y="403" type="line"/>
-      <point x="118" y="386" type="line"/>
-      <point x="329" y="386" type="line" smooth="yes"/>
-      <point x="437" y="386"/>
-      <point x="509" y="310"/>
-      <point x="509" y="195" type="curve" smooth="yes"/>
-      <point x="509" y="84"/>
-      <point x="438" y="18"/>
-      <point x="317" y="18" type="curve" smooth="yes"/>
-      <point x="126" y="18" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" 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 80accc50..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="511"/>
+  <advance width="535"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="256" y="357" name="center"/>
-  <anchor x="256" 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="245" y="0" type="line"/>
-      <point x="266" y="0" type="line"/>
-      <point x="266" y="676" type="line"/>
-      <point x="511" y="676" type="line"/>
-      <point x="511" y="694" type="line"/>
-      <point x="0" y="694" type="line"/>
-      <point x="0" y="676" type="line"/>
-      <point x="245" 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 b7fb625f..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="511"/>
+  <advance width="535"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="15" 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 2f74ed6c..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="511"/>
+  <advance width="535"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="81"/>
+    <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 074b4f7e..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="511"/>
+  <advance width="535"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="128"/>
+    <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 450ea7d9..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="511"/>
+  <advance width="535"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="124"/>
+    <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 f38daff5..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="511"/>
+  <advance width="535"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="133"/>
+    <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 eda5c06f..fd050a5c 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="511"/>
+  <advance width="535"/>
   <unicode hex="0422"/>
   <anchor x="569" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_horn.glif b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
index 88c381a9..784d4301 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="556"/>
+  <advance width="579"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="119" y="148" type="line"/>
-      <point x="280" y="148" type="line" smooth="yes"/>
-      <point x="422" y="148"/>
-      <point x="506" y="228"/>
-      <point x="506" y="357" type="curve" smooth="yes"/>
-      <point x="506" y="489"/>
-      <point x="418" y="574"/>
-      <point x="286" y="574" type="curve" smooth="yes"/>
-      <point x="119" y="574" type="line"/>
-      <point x="119" y="556" type="line"/>
-      <point x="280" y="556" type="line" smooth="yes"/>
-      <point x="402" y="556"/>
-      <point x="484" y="477"/>
-      <point x="484" y="355" type="curve" smooth="yes"/>
-      <point x="484" y="238"/>
-      <point x="410" y="166"/>
-      <point x="286" y="166" type="curve" smooth="yes"/>
-      <point x="119" y="166" type="line"/>
+      <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="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
+      <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 723420ce..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="511"/>
+  <advance width="535"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="3"/>
+    <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 b5fa061d..57d8aad0 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="661"/>
+  <advance width="677"/>
   <unicode hex="0426"/>
   <outline>
     <contour>
-      <point x="609" y="-175" type="line"/>
-      <point x="630" y="-175" type="line"/>
-      <point x="630" y="19" type="line"/>
-      <point x="126" y="19" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="609" 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="533" y="10" type="line"/>
-      <point x="554" y="10" type="line"/>
-      <point x="554" y="694" type="line"/>
-      <point x="533" 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/U_.glif b/src/Cantarell-Light.ufo/glyphs/U_.glif
index 3056f2b9..ff26b39b 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="643"/>
+  <advance width="687"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="405" y="10" name="ogonek"/>
-  <anchor x="323" y="694" name="top"/>
-  <anchor x="620" y="694" name="topright"/>
+  <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"/>
   <outline>
     <contour>
-      <point x="322" y="-10" type="curve" smooth="yes"/>
-      <point x="471" y="-10"/>
-      <point x="559" y="85"/>
-      <point x="559" y="246" type="curve" smooth="yes"/>
-      <point x="559" y="694" type="line"/>
-      <point x="538" y="694" type="line"/>
-      <point x="538" y="246" type="line" smooth="yes"/>
-      <point x="538" y="97"/>
-      <point x="459" y="9"/>
-      <point x="325" y="9" type="curve" smooth="yes"/>
-      <point x="187" y="9"/>
-      <point x="106" y="97"/>
-      <point x="106" y="246" type="curve" smooth="yes"/>
+      <point x="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="84" y="694" type="line"/>
-      <point x="84" y="246" type="line" smooth="yes"/>
-      <point x="84" y="85"/>
-      <point x="172" y="-10"/>
+      <point x="106" y="246" type="line" smooth="yes"/>
+      <point x="106" y="85"/>
+      <point x="194" 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 af21ea34..42254dc5 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="643"/>
+  <advance width="687"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="265"/>
+    <component base="acutecomb.case" xOffset="287"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_breve.glif b/src/Cantarell-Light.ufo/glyphs/U_breve.glif
index 39934974..f77f0cff 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="643"/>
+  <advance width="687"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="120"/>
+    <component base="brevecomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_caron.glif b/src/Cantarell-Light.ufo/glyphs/U_caron.glif
index 655ba6fe..ae89d9e6 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="643"/>
+  <advance width="687"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="148"/>
+    <component base="caroncomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/U_circumflex.glif
index d40c543a..3714bb73 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="643"/>
+  <advance width="687"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="146"/>
+    <component base="circumflexcomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/U_dblgrave.glif
index ea7fa56c..674e3e73 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="643"/>
+  <advance width="687"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="80"/>
+    <component base="dblgravecomb.case" xOffset="102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/U_dieresis.glif
index 02410459..f50bfe6f 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="643"/>
+  <advance width="687"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_dieresisacute.glif
index 83f472b9..b5a05d36 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="643"/>
+  <advance width="687"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
-    <component base="acutecomb.case" xOffset="265" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="125"/>
+    <component base="acutecomb.case" xOffset="287" 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 0983b88b..573c4bc3 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="643"/>
+  <advance width="687"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
-    <component base="caroncomb.case" xOffset="148" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="125"/>
+    <component base="caroncomb.case" xOffset="170" 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 9670c1c5..13bf6a67 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="643"/>
+  <advance width="687"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
-    <component base="gravecomb.case" xOffset="126" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="125"/>
+    <component base="gravecomb.case" xOffset="148" 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 5487a290..e9814950 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="643"/>
+  <advance width="687"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
-    <component base="macroncomb.case" xOffset="85" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="125"/>
+    <component base="macroncomb.case" xOffset="107" 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 64dab87b..7ebd1353 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="643"/>
+  <advance width="687"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_grave.glif b/src/Cantarell-Light.ufo/glyphs/U_grave.glif
index 9490e4c8..115f86bb 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="643"/>
+  <advance width="687"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/U_hookabove.glif
index 2a7ef842..a2ef32a3 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="643"/>
+  <advance width="687"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="168"/>
+    <component base="hookabovecomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horn.glif b/src/Cantarell-Light.ufo/glyphs/U_horn.glif
index 01fd04a3..7dab564c 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="715"/>
+  <advance width="759"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="488" yOffset="212"/>
+    <component base="horncomb" xOffset="510" 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 36f978ee..7428e710 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="715"/>
+  <advance width="759"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="265"/>
+    <component base="acutecomb.case" xOffset="287"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/U_horndotbelow.glif
index 9405a622..662c77e3 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="715"/>
+  <advance width="759"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/U_horngrave.glif
index fe4ed777..df36cc87 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="715"/>
+  <advance width="759"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="126"/>
+    <component base="gravecomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hornhookabove.glif
index 409f47e1..498a1348 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="715"/>
+  <advance width="759"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="168"/>
+    <component base="hookabovecomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/U_horntilde.glif
index bb32150d..6a875c9d 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="715"/>
+  <advance width="759"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="79"/>
+    <component base="tildecomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/U_hungarumlaut.glif
index 532cb41b..4a4e71b3 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="643"/>
+  <advance width="687"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="151"/>
+    <component base="hungarumlautcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/U_invertedbreve.glif
index c406a94d..2b2c7124 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="643"/>
+  <advance width="687"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="117"/>
+    <component base="breveinvertedcomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macron.glif b/src/Cantarell-Light.ufo/glyphs/U_macron.glif
index 62244ae7..e47f945f 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="643"/>
+  <advance width="687"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="85"/>
+    <component base="macroncomb.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/U_macrondieresis.glif
index 3846b242..fcbd8818 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="643"/>
+  <advance width="687"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="85"/>
-    <component base="dieresiscomb.case" xOffset="103" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="107"/>
+    <component base="dieresiscomb.case" xOffset="125" 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 3db728b2..a9eb9b00 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="643"/>
+  <advance width="687"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="4"/>
+    <component base="ogonekcomb.tall.case" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_ring.glif b/src/Cantarell-Light.ufo/glyphs/U_ring.glif
index d1f52ac6..ec6b2d44 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="643"/>
+  <advance width="687"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="149"/>
+    <component base="ringcomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
index 3f70c6ec..e81aa329 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="04AE"/>
   <anchor x="264" y="326" name="center"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
index 0bec3b75..fe3bacd9 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <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 01b5cd0b..873049bb 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="643"/>
+  <advance width="687"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="79"/>
+    <component base="tildecomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/U_tildeacute.glif
index 2e3f05cd..f4beed6b 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="643"/>
+  <advance width="687"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="79"/>
-    <component base="acutecomb.case" xOffset="265" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="101"/>
+    <component base="acutecomb.case" xOffset="287" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_.glif b/src/Cantarell-Light.ufo/glyphs/V_.glif
index 16d05ad6..df9a0a39 100644
--- a/src/Cantarell-Light.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/V_.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="568"/>
+  <advance width="584"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="285" y="694" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="0" type="line"/>
-      <point x="290" y="0" type="line"/>
-      <point x="550" y="694" type="line"/>
-      <point x="529" y="694" type="line"/>
-      <point x="282" y="30" type="line"/>
-      <point x="291" y="30" type="line"/>
-      <point x="41" y="694" type="line"/>
-      <point x="18" y="694" type="line"/>
+      <point x="288" y="0" type="line"/>
+      <point x="298" y="0" type="line"/>
+      <point x="558" y="694" type="line"/>
+      <point x="537" y="694" type="line"/>
+      <point x="290" y="30" type="line"/>
+      <point x="299" y="30" type="line"/>
+      <point x="49" y="694" type="line"/>
+      <point x="26" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Light.ufo/glyphs/V_e-cy.glif
index 2f07fbfd..91c4e101 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="611"/>
+  <advance width="634"/>
   <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 c4bbcf9a..8a4653e3 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="943"/>
+  <advance width="965"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="471" y="0" name="bottom"/>
-  <anchor x="471" y="694" name="top"/>
+  <anchor x="482" y="0" name="bottom"/>
+  <anchor x="482" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="231" y="0" type="line"/>
-      <point x="243" y="0" type="line"/>
-      <point x="479" y="666" type="line"/>
-      <point x="465" y="666" type="line"/>
-      <point x="703" y="0" type="line"/>
-      <point x="716" y="0" type="line"/>
-      <point x="923" y="694" type="line"/>
-      <point x="902" y="694" type="line"/>
-      <point x="706" y="32" type="line"/>
-      <point x="714" y="32" type="line"/>
-      <point x="479" y="688" type="line"/>
-      <point x="466" y="688" type="line"/>
-      <point x="234" y="32" type="line"/>
-      <point x="242" y="32" type="line"/>
-      <point x="43" y="694" type="line"/>
-      <point x="20" y="694" type="line"/>
+      <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"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_acute.glif b/src/Cantarell-Light.ufo/glyphs/W_acute.glif
index c30245e7..5a85fbc3 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="943"/>
+  <advance width="965"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="413"/>
+    <component base="acutecomb.case" xOffset="424"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/W_circumflex.glif
index 787c9a0a..1aaec7f1 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="943"/>
+  <advance width="965"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="294"/>
+    <component base="circumflexcomb.case" xOffset="305"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/W_dieresis.glif
index cbc517dc..26dfde49 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="943"/>
+  <advance width="965"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="251"/>
+    <component base="dieresiscomb.case" xOffset="262"/>
   </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 f246f52e..4a4e919b 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="943"/>
+  <advance width="965"/>
   <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 aa1a8f57..76ba64df 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="943"/>
+  <advance width="965"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="274"/>
+    <component base="gravecomb.case" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_.glif b/src/Cantarell-Light.ufo/glyphs/X_.glif
index 1a7a170e..149e475f 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="560"/>
+  <advance width="594"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="694" name="top"/>
+  <anchor x="300" y="0" name="bottom"/>
+  <anchor x="300" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="517" y="0" type="line"/>
-      <point x="544" y="0" type="line"/>
-      <point x="274" y="385" type="line"/>
-      <point x="72" y="694" type="line"/>
-      <point x="45" y="694" type="line"/>
-      <point x="261" y="369" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="561" y="0" type="line"/>
+      <point x="291" y="385" type="line"/>
+      <point x="89" y="694" type="line"/>
+      <point x="62" y="694" type="line"/>
+      <point x="278" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="16" y="0" type="line"/>
-      <point x="40" y="0" type="line"/>
-      <point x="279" y="351" type="line"/>
-      <point x="268" y="367" type="line"/>
+      <point x="33" y="0" type="line"/>
+      <point x="57" y="0" type="line"/>
+      <point x="296" y="351" type="line"/>
+      <point x="285" y="367" type="line"/>
     </contour>
     <contour>
-      <point x="287" y="358" type="line"/>
-      <point x="524" y="694" type="line"/>
-      <point x="500" y="694" type="line"/>
-      <point x="276" y="375" type="line"/>
+      <point x="304" y="358" type="line"/>
+      <point x="541" y="694" type="line"/>
+      <point x="517" y="694" type="line"/>
+      <point x="293" 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 f637355e..0c2d00db 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="269" y="0" name="bottom"/>
-  <anchor x="269" y="694" name="top"/>
-  <anchor x="-3" y="694" name="topleft"/>
+  <anchor x="277" y="0" name="bottom"/>
+  <anchor x="277" y="694" name="top"/>
+  <anchor x="5" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="254" y="0" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="275" y="333" type="line"/>
-      <point x="512" y="694" type="line"/>
-      <point x="489" y="694" type="line"/>
-      <point x="262" y="344" type="line"/>
+      <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="42" y="694" type="line"/>
-      <point x="16" y="694" type="line"/>
-      <point x="254" y="333" 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"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
index 5cbb74d1..3cec61dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="211"/>
+    <component base="acutecomb.case" xOffset="219"/>
   </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 a53bc317..5a93d13c 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="693"/>
+  <advance width="709"/>
   <unicode hex="0462"/>
   <outline>
     <contour>
-      <point x="192" y="0" type="line"/>
-      <point x="405" y="0" type="line" smooth="yes"/>
-      <point x="548" y="0"/>
-      <point x="633" y="74"/>
-      <point x="633" y="200" type="curve" smooth="yes"/>
-      <point x="633" y="322"/>
-      <point x="555" y="403"/>
-      <point x="439" y="403" type="curve" smooth="yes"/>
-      <point x="205" y="403" type="line"/>
-      <point x="205" y="386" type="line"/>
-      <point x="429" y="386" type="line" smooth="yes"/>
-      <point x="536" y="386"/>
-      <point x="611" y="312"/>
-      <point x="611" y="195" type="curve" smooth="yes"/>
-      <point x="611" y="82"/>
-      <point x="541" y="18"/>
-      <point x="416" y="18" type="curve" smooth="yes"/>
-      <point x="213" y="18" type="line"/>
-      <point x="213" y="694" type="line"/>
-      <point x="192" 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="47" y="545" type="line"/>
-      <point x="407" y="545" type="line"/>
-      <point x="407" y="564" type="line"/>
-      <point x="47" 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 8d918466..d328cd65 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="92"/>
+    <component base="circumflexcomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
index ed856b68..126b88d6 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="49"/>
+    <component base="dieresiscomb.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
index 643b3a95..d7bf205e 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="150"/>
+    <component base="dotaccentcomb.case" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
index ff90ac2a..3dc29df4 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="157"/>
   </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 07db8cf2..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="775"/>
+  <advance width="807"/>
   <unicode hex="042B"/>
-  <anchor x="393" y="694" name="top"/>
+  <anchor x="409" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="288" y="0" type="line" smooth="yes"/>
-      <point x="431" y="0"/>
-      <point x="516" y="74"/>
-      <point x="516" y="200" type="curve" smooth="yes"/>
-      <point x="516" y="322"/>
-      <point x="438" y="403"/>
-      <point x="322" y="403" type="curve" smooth="yes"/>
-      <point x="118" y="403" type="line"/>
-      <point x="118" y="386" type="line"/>
-      <point x="312" y="386" type="line" smooth="yes"/>
-      <point x="421" y="386"/>
-      <point x="494" y="310"/>
-      <point x="494" y="195" type="curve" smooth="yes"/>
-      <point x="494" y="84"/>
-      <point x="422" y="18"/>
-      <point x="299" y="18" type="curve" smooth="yes"/>
-      <point x="126" y="18" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" 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="650" y="0" type="line"/>
-      <point x="671" y="0" type="line"/>
-      <point x="671" y="694" type="line"/>
-      <point x="650" 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 680396cc..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="775"/>
+  <advance width="807"/>
   <unicode hex="04F8"/>
   <outline>
     <component base="Yeru-cy"/>
-    <component base="dieresiscomb.case" xOffset="173"/>
+    <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 cdd7cd5c..4e4c25fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="72"/>
+    <component base="gravecomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
index fe2ffdeb..5d89918d 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="114"/>
+    <component base="hookabovecomb.case" xOffset="122"/>
   </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 aa05ab4a..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="229"/>
+  <advance width="261"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-105"/>
+    <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 8df39672..571b9dc4 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="31"/>
+    <component base="macroncomb.case" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
index 99020eb5..5adb8dbd 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="528"/>
+  <advance width="544"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="25"/>
+    <component base="tildecomb.case" xOffset="33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_.glif b/src/Cantarell-Light.ufo/glyphs/Z_.glif
index cbf269d0..dea846b2 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="588"/>
+  <advance width="598"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="284" y="0" name="bottom"/>
-  <anchor x="284" y="694" name="top"/>
+  <anchor x="289" y="0" name="bottom"/>
+  <anchor x="289" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="30" y="0" type="line"/>
-      <point x="558" y="0" type="line"/>
-      <point x="558" y="18" type="line"/>
-      <point x="52" y="18" type="line"/>
-      <point x="52" y="12" type="line"/>
-      <point x="541" y="677" type="line"/>
-      <point x="541" y="694" type="line"/>
-      <point x="48" y="694" type="line"/>
-      <point x="48" y="676" type="line"/>
-      <point x="519" y="676" type="line"/>
-      <point x="519" y="682" type="line"/>
-      <point x="30" y="16" type="line"/>
+      <point x="35" y="0" type="line"/>
+      <point x="563" y="0" type="line"/>
+      <point x="563" y="18" type="line"/>
+      <point x="57" y="18" type="line"/>
+      <point x="57" y="12" type="line"/>
+      <point x="546" y="677" type="line"/>
+      <point x="546" y="694" type="line"/>
+      <point x="53" y="694" type="line"/>
+      <point x="53" y="676" type="line"/>
+      <point x="524" y="676" type="line"/>
+      <point x="524" y="682" type="line"/>
+      <point x="35" 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 c7900642..92c41ff8 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="588"/>
+  <advance width="598"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="226"/>
+    <component base="acutecomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/Z_caron.glif
index 9831df4f..c503c64f 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="588"/>
+  <advance width="598"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="109"/>
+    <component base="caroncomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotaccent.glif
index 637fb9f5..91d14610 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="588"/>
+  <advance width="598"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="165"/>
+    <component base="dotaccentcomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/Z_dotbelow.glif
index 802cebdb..42289a38 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="588"/>
+  <advance width="598"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="164"/>
+    <component base="dotbelowcomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/a-cy.glif b/src/Cantarell-Light.ufo/glyphs/a-cy.glif
index c9adb5c0..166d8c72 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="487"/>
+  <advance width="501"/>
   <unicode hex="0430"/>
   <anchor x="233" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/a.glif b/src/Cantarell-Light.ufo/glyphs/a.glif
index 3c434b76..ac3db196 100644
--- a/src/Cantarell-Light.ufo/glyphs/a.glif
+++ b/src/Cantarell-Light.ufo/glyphs/a.glif
@@ -1,54 +1,54 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="a" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0061"/>
   <note>
 a
 </note>
-  <anchor x="242" y="0" name="bottom"/>
-  <anchor x="389" y="10" name="ogonek"/>
-  <anchor x="223" y="480" name="top"/>
+  <anchor x="250" y="0" name="bottom"/>
+  <anchor x="397" y="10" name="ogonek"/>
+  <anchor x="231" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="378" y="0" type="line"/>
-      <point x="395" y="0" type="line"/>
-      <point x="395" y="327" type="line" smooth="yes"/>
-      <point x="395" y="428"/>
-      <point x="336" y="486"/>
-      <point x="238" y="486" type="curve" smooth="yes"/>
-      <point x="186" y="486"/>
-      <point x="126" y="470"/>
-      <point x="74" y="444" type="curve"/>
-      <point x="79" y="430" type="line"/>
-      <point x="126" y="453"/>
-      <point x="182" y="468"/>
-      <point x="232" y="468" type="curve" smooth="yes"/>
-      <point x="323" y="468"/>
-      <point x="374" y="419"/>
-      <point x="374" y="323" type="curve" smooth="yes"/>
-      <point x="374" y="71" type="line"/>
+      <point x="386" y="0" type="line"/>
+      <point x="403" y="0" type="line"/>
+      <point x="403" y="327" type="line" smooth="yes"/>
+      <point x="403" y="428"/>
+      <point x="344" y="486"/>
+      <point x="246" y="486" type="curve" smooth="yes"/>
+      <point x="194" y="486"/>
+      <point x="134" y="470"/>
+      <point x="82" y="444" type="curve"/>
+      <point x="87" y="430" type="line"/>
+      <point x="134" y="453"/>
+      <point x="190" y="468"/>
+      <point x="240" y="468" type="curve" smooth="yes"/>
+      <point x="331" y="468"/>
+      <point x="382" y="419"/>
+      <point x="382" y="323" type="curve" smooth="yes"/>
+      <point x="382" y="71" type="line"/>
     </contour>
     <contour>
-      <point x="207" y="-10" type="curve" smooth="yes"/>
-      <point x="274" y="-10"/>
-      <point x="334" y="17"/>
-      <point x="382" y="68" type="curve"/>
-      <point x="382" y="86" type="line"/>
-      <point x="325" y="32"/>
-      <point x="273" y="8"/>
-      <point x="213" y="8" type="curve" smooth="yes"/>
-      <point x="131" y="8"/>
-      <point x="77" y="53"/>
-      <point x="77" y="121" type="curve" smooth="yes"/>
-      <point x="77" y="209"/>
-      <point x="169" y="247"/>
-      <point x="382" y="247" type="curve"/>
-      <point x="382" y="263" type="line"/>
-      <point x="159" y="263"/>
-      <point x="56" y="217"/>
-      <point x="56" y="117" type="curve" smooth="yes"/>
-      <point x="56" y="41"/>
-      <point x="115" y="-10"/>
+      <point x="215" y="-10" type="curve" smooth="yes"/>
+      <point x="282" y="-10"/>
+      <point x="342" y="17"/>
+      <point x="390" y="68" type="curve"/>
+      <point x="390" y="86" type="line"/>
+      <point x="333" y="32"/>
+      <point x="281" y="8"/>
+      <point x="221" y="8" type="curve" smooth="yes"/>
+      <point x="139" y="8"/>
+      <point x="85" y="53"/>
+      <point x="85" y="121" type="curve" smooth="yes"/>
+      <point x="85" y="209"/>
+      <point x="177" y="247"/>
+      <point x="390" y="247" type="curve"/>
+      <point x="390" y="263" type="line"/>
+      <point x="167" y="263"/>
+      <point x="64" y="217"/>
+      <point x="64" y="117" type="curve" smooth="yes"/>
+      <point x="64" y="41"/>
+      <point x="123" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/aacute.glif b/src/Cantarell-Light.ufo/glyphs/aacute.glif
index 6cf58b1c..eb6b9138 100644
--- a/src/Cantarell-Light.ufo/glyphs/aacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aacute" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E1"/>
   <outline>
     <component base="a"/>
-    <component base="acutecomb" xOffset="156"/>
+    <component base="acutecomb" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
index 1364c176..0ae37cce 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve-cy" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="04D1"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreve.glif b/src/Cantarell-Light.ufo/glyphs/abreve.glif
index 4d558eed..0284b105 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreve" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0103"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb" xOffset="37"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
index 586834e6..5a0eb0ff 100644
--- a/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abreveacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abreveacute" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EAF"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb.loclVIET" xOffset="15"/>
-    <component base="acutecomb.loclVIET" xOffset="148" yOffset="80"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="acutecomb.loclVIET" xOffset="156" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
index 10cfdbfd..dff8cb2d 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevedotbelow" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EB7"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="122"/>
-    <component base="brevecomb" xOffset="37"/>
+    <component base="dotbelowcomb" xOffset="130"/>
+    <component base="brevecomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
index 0436c134..b28d7b5b 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevegrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevegrave" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EB1"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb.loclVIET" xOffset="15"/>
-    <component base="gravecomb.loclVIET" xOffset="44" yOffset="80"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="gravecomb.loclVIET" xOffset="52" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
index 1bc8a8d0..4a08b3c2 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevehookabove.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevehookabove" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EB3"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb.loclVIET" xOffset="15"/>
-    <component base="hookabovecomb.loclVIET" xOffset="75" yOffset="80"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="hookabovecomb.loclVIET" xOffset="83" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
index 474378f1..563fd21b 100644
--- a/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/abrevetilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="abrevetilde" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EB5"/>
   <outline>
     <component base="a"/>
-    <component base="brevecomb.loclVIET" xOffset="15"/>
-    <component base="tildecomb.loclVIET" xOffset="-14" yOffset="80"/>
+    <component base="brevecomb.loclVIET" xOffset="23"/>
+    <component base="tildecomb.loclVIET" xOffset="-6" yOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acaron.glif b/src/Cantarell-Light.ufo/glyphs/acaron.glif
index 445b8fc8..619e77e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/acaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acaron" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="01CE"/>
   <outline>
     <component base="a"/>
-    <component base="caroncomb" xOffset="40"/>
+    <component base="caroncomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
index 3261180a..4dbab78d 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflex" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E2"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb" xOffset="52"/>
+    <component base="circumflexcomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
index 1aafbd75..9bb62b74 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexacute" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EA5"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb.loclVIET" xOffset="47"/>
-    <component base="acutecomb.loclVIET" xOffset="266" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="acutecomb.loclVIET" xOffset="274" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
index 46a88cc5..d563b2e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexdotbelow" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EAD"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="122"/>
-    <component base="circumflexcomb" xOffset="52"/>
+    <component base="dotbelowcomb" xOffset="130"/>
+    <component base="circumflexcomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
index 2169de5d..4bb5ca73 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexgrave" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EA7"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb.loclVIET" xOffset="47"/>
-    <component base="gravecomb.loclVIET" xOffset="162" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="gravecomb.loclVIET" xOffset="170" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
index 61a52d21..f5fd8261 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflexhookabove" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EA9"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb.loclVIET" xOffset="47"/>
-    <component base="hookabovecomb.loclVIET" xOffset="193" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="hookabovecomb.loclVIET" xOffset="201" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
index 99ade930..e494d3b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acircumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="acircumflextilde" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EAB"/>
   <outline>
     <component base="a"/>
-    <component base="circumflexcomb.loclVIET" xOffset="47"/>
-    <component base="tildecomb.loclVIET" xOffset="-4" yOffset="80"/>
+    <component base="circumflexcomb.loclVIET" xOffset="55"/>
+    <component base="tildecomb.loclVIET" xOffset="4" yOffset="80"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
index 54dc6a30..ea794b5e 100644
--- a/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adblgrave" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0201"/>
   <outline>
     <component base="a"/>
-    <component base="dblgravecomb" xOffset="-29"/>
+    <component base="dblgravecomb" xOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
index bdfc9999..7ec2e5fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis-cy" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="04D3"/>
   <outline>
     <component base="a-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/adieresis.glif b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
index 3e6ac173..88cfec1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/adieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adieresis" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E4"/>
   <outline>
     <component base="a"/>
-    <component base="dieresiscomb" xOffset="4"/>
+    <component base="dieresiscomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
index 1bcf8eba..842e9a06 100644
--- a/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/adotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="adotbelow" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EA1"/>
   <outline>
     <component base="a"/>
-    <component base="dotbelowcomb" xOffset="122"/>
+    <component base="dotbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ae.glif b/src/Cantarell-Light.ufo/glyphs/ae.glif
index 72215b9f..82787d48 100644
--- a/src/Cantarell-Light.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ae.glif
@@ -1,82 +1,82 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="839"/>
+  <advance width="846"/>
   <unicode hex="00E6"/>
-  <anchor x="416" y="0" name="bottom"/>
-  <anchor x="416" y="480" name="top"/>
+  <anchor x="424" y="0" name="bottom"/>
+  <anchor x="424" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="611" y="-10" type="curve" smooth="yes"/>
-      <point x="666" y="-10"/>
-      <point x="713" y="5"/>
-      <point x="754" y="37" type="curve"/>
-      <point x="749" y="51" type="line"/>
-      <point x="707" y="21"/>
-      <point x="663" y="6"/>
-      <point x="611" y="6" type="curve" smooth="yes"/>
-      <point x="486" y="6"/>
-      <point x="404" y="93"/>
-      <point x="404" y="241" type="curve" smooth="yes"/>
-      <point x="404" y="376"/>
-      <point x="473" y="468"/>
-      <point x="583" y="468" type="curve" smooth="yes"/>
-      <point x="691" y="468"/>
-      <point x="754" y="380"/>
-      <point x="754" y="261" type="curve"/>
-      <point x="393" y="261" type="line"/>
-      <point x="393" y="244" type="line"/>
-      <point x="774" y="244" type="line"/>
-      <point x="775" y="251"/>
-      <point x="775" y="256"/>
-      <point x="775" y="264" type="curve" smooth="yes"/>
-      <point x="775" y="388"/>
-      <point x="702" y="486"/>
-      <point x="585" y="486" type="curve" smooth="yes"/>
-      <point x="467" y="486"/>
-      <point x="384" y="386"/>
-      <point x="384" y="239" type="curve" smooth="yes"/>
-      <point x="384" y="87"/>
-      <point x="472" y="-10"/>
+      <point x="619" y="-10" type="curve" smooth="yes"/>
+      <point x="674" y="-10"/>
+      <point x="721" y="5"/>
+      <point x="762" y="37" type="curve"/>
+      <point x="757" y="51" type="line"/>
+      <point x="715" y="21"/>
+      <point x="671" y="6"/>
+      <point x="619" y="6" type="curve" smooth="yes"/>
+      <point x="494" y="6"/>
+      <point x="412" y="93"/>
+      <point x="412" y="241" type="curve" smooth="yes"/>
+      <point x="412" y="376"/>
+      <point x="481" y="468"/>
+      <point x="591" y="468" type="curve" smooth="yes"/>
+      <point x="699" y="468"/>
+      <point x="762" y="380"/>
+      <point x="762" y="261" type="curve"/>
+      <point x="401" y="261" type="line"/>
+      <point x="401" y="244" type="line"/>
+      <point x="782" y="244" type="line"/>
+      <point x="783" y="251"/>
+      <point x="783" y="256"/>
+      <point x="783" y="264" type="curve" smooth="yes"/>
+      <point x="783" y="388"/>
+      <point x="710" y="486"/>
+      <point x="593" y="486" type="curve" smooth="yes"/>
+      <point x="475" y="486"/>
+      <point x="392" y="386"/>
+      <point x="392" y="239" type="curve" smooth="yes"/>
+      <point x="392" y="87"/>
+      <point x="480" y="-10"/>
     </contour>
     <contour>
-      <point x="203" y="-10" type="curve" smooth="yes"/>
-      <point x="306" y="-10"/>
-      <point x="390" y="55"/>
-      <point x="407" y="154" type="curve"/>
-      <point x="396" y="162" type="line"/>
-      <point x="382" y="73"/>
-      <point x="307" y="8"/>
-      <point x="207" y="8" type="curve" smooth="yes"/>
-      <point x="129" y="8"/>
-      <point x="77" y="48"/>
-      <point x="77" y="112" type="curve" smooth="yes"/>
-      <point x="77" y="202"/>
-      <point x="180" y="244"/>
-      <point x="392" y="244" type="curve"/>
-      <point x="392" y="262" type="line"/>
-      <point x="176" y="262"/>
-      <point x="56" y="210"/>
-      <point x="56" y="109" type="curve" smooth="yes"/>
-      <point x="56" y="37"/>
-      <point x="116" y="-10"/>
+      <point x="211" y="-10" type="curve" smooth="yes"/>
+      <point x="314" y="-10"/>
+      <point x="398" y="55"/>
+      <point x="415" y="154" type="curve"/>
+      <point x="404" y="162" type="line"/>
+      <point x="390" y="73"/>
+      <point x="315" y="8"/>
+      <point x="215" y="8" type="curve" smooth="yes"/>
+      <point x="137" y="8"/>
+      <point x="85" y="48"/>
+      <point x="85" y="112" type="curve" smooth="yes"/>
+      <point x="85" y="202"/>
+      <point x="188" y="244"/>
+      <point x="400" y="244" type="curve"/>
+      <point x="400" y="262" type="line"/>
+      <point x="184" y="262"/>
+      <point x="64" y="210"/>
+      <point x="64" y="109" type="curve" smooth="yes"/>
+      <point x="64" y="37"/>
+      <point x="124" y="-10"/>
     </contour>
     <contour>
-      <point x="384" y="239" type="line"/>
-      <point x="399" y="239" type="line"/>
-      <point x="399" y="327" type="line" smooth="yes"/>
-      <point x="399" y="429"/>
-      <point x="342" y="486"/>
-      <point x="240" y="486" type="curve" smooth="yes"/>
-      <point x="174" y="486"/>
-      <point x="105" y="463"/>
-      <point x="59" y="426" type="curve"/>
-      <point x="64" y="412" type="line"/>
-      <point x="109" y="447"/>
-      <point x="172" y="468"/>
-      <point x="234" y="468" type="curve" smooth="yes"/>
-      <point x="331" y="468"/>
-      <point x="384" y="416"/>
-      <point x="384" y="322" type="curve" smooth="yes"/>
+      <point x="392" y="239" type="line"/>
+      <point x="407" y="239" type="line"/>
+      <point x="407" y="327" type="line" smooth="yes"/>
+      <point x="407" y="429"/>
+      <point x="350" y="486"/>
+      <point x="248" y="486" type="curve" smooth="yes"/>
+      <point x="182" y="486"/>
+      <point x="113" y="463"/>
+      <point x="67" y="426" type="curve"/>
+      <point x="72" y="412" type="line"/>
+      <point x="117" y="447"/>
+      <point x="180" y="468"/>
+      <point x="242" y="468" type="curve" smooth="yes"/>
+      <point x="339" y="468"/>
+      <point x="392" y="416"/>
+      <point x="392" y="322" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/aeacute.glif b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
index ea5b18e5..f76a0288 100644
--- a/src/Cantarell-Light.ufo/glyphs/aeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aeacute" format="2">
-  <advance width="839"/>
+  <advance width="846"/>
   <unicode hex="01FD"/>
   <outline>
     <component base="ae"/>
-    <component base="acutecomb" xOffset="349"/>
+    <component base="acutecomb" xOffset="357"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/agrave.glif b/src/Cantarell-Light.ufo/glyphs/agrave.glif
index afbdc2f5..93c4ece7 100644
--- a/src/Cantarell-Light.ufo/glyphs/agrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/agrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="agrave" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E0"/>
   <outline>
     <component base="a"/>
-    <component base="gravecomb" xOffset="39"/>
+    <component base="gravecomb" xOffset="47"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
index 8485de81..5c783bde 100644
--- a/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ahookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ahookabove" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="1EA3"/>
   <outline>
     <component base="a"/>
-    <component base="hookabovecomb" xOffset="71"/>
+    <component base="hookabovecomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
index 5ffd65c0..10f43b49 100644
--- a/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aie-cy" format="2">
-  <advance width="839"/>
+  <advance width="846"/>
   <unicode hex="04D5"/>
   <outline>
     <component base="ae"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
index fbfe1603..2e7ee9f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ainvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ainvertedbreve" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0203"/>
   <outline>
     <component base="a"/>
-    <component base="breveinvertedcomb" xOffset="22"/>
+    <component base="breveinvertedcomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/amacron.glif b/src/Cantarell-Light.ufo/glyphs/amacron.glif
index 107c5e10..4d92777c 100644
--- a/src/Cantarell-Light.ufo/glyphs/amacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/amacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="amacron" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0101"/>
   <outline>
     <component base="a"/>
-    <component base="macroncomb" xOffset="-20"/>
+    <component base="macroncomb" xOffset="-12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aogonek.glif b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
index 5e7fe2a9..281983ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/aogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aogonek" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="0105"/>
   <outline>
     <component base="a"/>
-    <component base="ogonekcomb" xOffset="-12"/>
+    <component base="ogonekcomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aring.glif b/src/Cantarell-Light.ufo/glyphs/aring.glif
index d5662ce6..0d102ba6 100644
--- a/src/Cantarell-Light.ufo/glyphs/aring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aring" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E5"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb" xOffset="49"/>
+    <component base="ringcomb" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/aringacute.glif b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
index 794bf720..a4612a60 100644
--- a/src/Cantarell-Light.ufo/glyphs/aringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/aringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="aringacute" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="01FB"/>
   <outline>
     <component base="a"/>
-    <component base="ringcomb_acutecomb" xOffset="73"/>
+    <component base="ringcomb_acutecomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/atilde.glif b/src/Cantarell-Light.ufo/glyphs/atilde.glif
index f193b7c9..192af12a 100644
--- a/src/Cantarell-Light.ufo/glyphs/atilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/atilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="atilde" format="2">
-  <advance width="487"/>
+  <advance width="501"/>
   <unicode hex="00E3"/>
   <outline>
     <component base="a"/>
-    <component base="tildecomb" xOffset="-12"/>
+    <component base="tildecomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/b.glif b/src/Cantarell-Light.ufo/glyphs/b.glif
index 7647f9d9..60fc1223 100644
--- a/src/Cantarell-Light.ufo/glyphs/b.glif
+++ b/src/Cantarell-Light.ufo/glyphs/b.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="553"/>
+  <advance width="564"/>
   <unicode hex="0062"/>
   <note>
 b
 </note>
-  <anchor x="272" y="0" name="bottom"/>
-  <anchor x="272" y="480" name="top"/>
+  <anchor x="279" y="0" name="bottom"/>
+  <anchor x="279" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="279" y="-10" type="curve" smooth="yes"/>
-      <point x="404" y="-10"/>
-      <point x="489" y="90"/>
-      <point x="489" y="240" type="curve" smooth="yes"/>
-      <point x="489" y="389"/>
-      <point x="405" y="486"/>
-      <point x="281" y="486" type="curve" smooth="yes"/>
-      <point x="198" y="486"/>
-      <point x="138" y="444"/>
-      <point x="105" y="375" type="curve"/>
-      <point x="109" y="355" type="line"/>
-      <point x="139" y="425"/>
-      <point x="197" y="468"/>
-      <point x="276" y="468" type="curve" smooth="yes"/>
-      <point x="392" y="468"/>
-      <point x="468" y="378"/>
-      <point x="468" y="237" type="curve" smooth="yes"/>
-      <point x="468" y="97"/>
-      <point x="393" y="8"/>
-      <point x="281" y="8" type="curve" smooth="yes"/>
-      <point x="201" y="8"/>
-      <point x="140" y="53"/>
-      <point x="110" y="126" type="curve"/>
-      <point x="107" y="96" type="line"/>
-      <point x="140" y="29"/>
-      <point x="199" y="-10"/>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="411" y="-10"/>
+      <point x="496" y="90"/>
+      <point x="496" y="240" type="curve" smooth="yes"/>
+      <point x="496" y="389"/>
+      <point x="412" y="486"/>
+      <point x="288" y="486" type="curve" smooth="yes"/>
+      <point x="205" y="486"/>
+      <point x="145" y="444"/>
+      <point x="112" y="375" type="curve"/>
+      <point x="116" y="355" type="line"/>
+      <point x="146" y="425"/>
+      <point x="204" y="468"/>
+      <point x="283" y="468" type="curve" smooth="yes"/>
+      <point x="399" y="468"/>
+      <point x="475" y="378"/>
+      <point x="475" y="237" type="curve" smooth="yes"/>
+      <point x="475" y="97"/>
+      <point x="400" y="8"/>
+      <point x="288" y="8" type="curve" smooth="yes"/>
+      <point x="208" y="8"/>
+      <point x="147" y="53"/>
+      <point x="117" y="126" type="curve"/>
+      <point x="114" y="96" type="line"/>
+      <point x="147" y="29"/>
+      <point x="206" y="-10"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="116" y="0" type="line"/>
-      <point x="119" y="64" type="line"/>
-      <point x="119" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="123" y="0" type="line"/>
+      <point x="126" y="64" type="line"/>
+      <point x="126" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/bar.glif b/src/Cantarell-Light.ufo/glyphs/bar.glif
index bb172ec3..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="227"/>
+  <advance width="259"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="104" y="-180" type="line"/>
-      <point x="123" y="-180" type="line"/>
-      <point x="123" y="739" type="line"/>
-      <point x="104" 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 1c05f6c2..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="721"/>
+  <advance width="753"/>
   <unicode hex="2423"/>
   <note>
 uni2423
 </note>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="617" y="0" type="line"/>
-      <point x="617" y="116" type="line"/>
-      <point x="597" y="116" type="line"/>
-      <point x="597" y="17" type="line"/>
-      <point x="124" y="17" type="line"/>
-      <point x="124" y="116" type="line"/>
-      <point x="104" 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/brokenbar.glif b/src/Cantarell-Light.ufo/glyphs/brokenbar.glif
index 0cfe663b..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="228"/>
+  <advance width="260"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="104" y="-181" type="line"/>
-      <point x="124" y="-181" type="line"/>
-      <point x="124" y="181" type="line"/>
-      <point x="104" 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="104" y="412" type="line"/>
-      <point x="124" y="412" type="line"/>
-      <point x="124" y="740" type="line"/>
-      <point x="104" 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/c.glif b/src/Cantarell-Light.ufo/glyphs/c.glif
index dda33af2..e8ade5a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/c.glif
+++ b/src/Cantarell-Light.ufo/glyphs/c.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="c" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="0063"/>
   <note>
 c
 </note>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="240" y="480" name="top"/>
+  <anchor x="229" y="0" name="bottom"/>
+  <anchor x="244" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="316" y="-10"/>
-      <point x="366" y="4"/>
-      <point x="407" y="28" type="curve"/>
-      <point x="402" y="42" type="line"/>
-      <point x="358" y="18"/>
-      <point x="313" y="6"/>
-      <point x="272" y="6" type="curve" smooth="yes"/>
-      <point x="159" y="6"/>
-      <point x="85" y="98"/>
-      <point x="85" y="241" type="curve" smooth="yes"/>
-      <point x="85" y="384"/>
-      <point x="158" y="468"/>
-      <point x="280" y="468" type="curve" smooth="yes"/>
-      <point x="324" y="468"/>
-      <point x="364" y="457"/>
-      <point x="402" y="436" type="curve"/>
-      <point x="409" y="452" type="line"/>
-      <point x="368" y="475"/>
-      <point x="327" y="486"/>
-      <point x="282" y="486" type="curve" smooth="yes"/>
-      <point x="147" y="486"/>
-      <point x="64" y="391"/>
-      <point x="64" y="236" type="curve" smooth="yes"/>
-      <point x="64" y="85"/>
-      <point x="143" y="-10"/>
+      <point x="272" y="-10" type="curve" smooth="yes"/>
+      <point x="320" y="-10"/>
+      <point x="370" y="4"/>
+      <point x="411" y="28" type="curve"/>
+      <point x="406" y="42" type="line"/>
+      <point x="362" y="18"/>
+      <point x="317" y="6"/>
+      <point x="276" y="6" type="curve" smooth="yes"/>
+      <point x="163" y="6"/>
+      <point x="89" y="98"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="384"/>
+      <point x="162" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="328" y="468"/>
+      <point x="368" y="457"/>
+      <point x="406" y="436" type="curve"/>
+      <point x="413" y="452" type="line"/>
+      <point x="372" y="475"/>
+      <point x="331" y="486"/>
+      <point x="286" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="68" y="391"/>
+      <point x="68" y="236" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="147" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/cacute.glif b/src/Cantarell-Light.ufo/glyphs/cacute.glif
index 3a9a7638..06696c08 100644
--- a/src/Cantarell-Light.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
-    <component base="acutecomb" xOffset="173"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccaron.glif b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
index 315f1ddb..956939ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
-    <component base="caroncomb" xOffset="57"/>
+    <component base="caroncomb" xOffset="61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
index 04f30fdc..1b79a333 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
+    <component base="cedillacomb" xOffset="104"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
index fb73114b..429d937c 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
-    <component base="acutecomb" xOffset="173"/>
+    <component base="cedillacomb" xOffset="104"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
index b24ab4df..5136182f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ccircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
-    <component base="circumflexcomb" xOffset="69"/>
+    <component base="circumflexcomb" xOffset="73"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
index 227c43e2..f35a647c 100644
--- a/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccentcomb" xOffset="121"/>
+    <component base="dotaccentcomb" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/che-cy.glif b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
index 00a2f396..368ace7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/che-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/che-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="che-cy" format="2">
-  <advance width="497"/>
+  <advance width="504"/>
   <unicode hex="0447"/>
   <anchor x="424" y="0" name="bottomright"/>
   <anchor x="242" y="480" name="top"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
index d3caea96..be777c9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chedieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chedieresis-cy" format="2">
-  <advance width="497"/>
+  <advance width="504"/>
   <unicode hex="04F5"/>
   <outline>
     <component base="che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
index 4915b916..c5a957ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chekhakassian-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chekhakassian-cy" format="2">
-  <advance width="497"/>
+  <advance width="504"/>
   <unicode hex="04CC"/>
   <outline>
     <component base="che-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
index 2ebff28c..b83cafe4 100644
--- a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="512"/>
+  <advance width="519"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/d.glif b/src/Cantarell-Light.ufo/glyphs/d.glif
index cb3a1a8b..5312e44f 100644
--- a/src/Cantarell-Light.ufo/glyphs/d.glif
+++ b/src/Cantarell-Light.ufo/glyphs/d.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="d" format="2">
-  <advance width="553"/>
+  <advance width="564"/>
   <unicode hex="0064"/>
   <note>
 d
 </note>
-  <anchor x="282" y="0" name="bottom"/>
-  <anchor x="398" y="592" name="center"/>
-  <anchor x="282" y="480" name="top"/>
-  <anchor x="555" y="480" name="topright"/>
+  <anchor x="286" y="0" name="bottom"/>
+  <anchor x="402" y="592" name="center"/>
+  <anchor x="286" y="480" name="top"/>
+  <anchor x="559" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="346" y="-10"/>
-      <point x="403" y="23"/>
-      <point x="439" y="85" type="curve"/>
-      <point x="436" y="106" type="line"/>
-      <point x="404" y="44"/>
-      <point x="348" y="8"/>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="346" y="468"/>
-      <point x="404" y="431"/>
-      <point x="436" y="367" type="curve"/>
-      <point x="440" y="396" type="line"/>
-      <point x="406" y="454"/>
-      <point x="350" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="739" type="line"/>
-      <point x="434" y="739" type="line"/>
-      <point x="434" y="64" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="457" y="0" type="line"/>
+      <point x="457" y="739" type="line"/>
+      <point x="438" y="739" type="line"/>
+      <point x="438" y="64" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dcaron.glif b/src/Cantarell-Light.ufo/glyphs/dcaron.glif
index 9965c9ff..cafae937 100644
--- a/src/Cantarell-Light.ufo/glyphs/dcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="010F"/>
   <outline>
     <component base="d"/>
-    <component base="caroncomb.alt" xOffset="443"/>
+    <component base="caroncomb.alt" xOffset="447"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dcroat.glif b/src/Cantarell-Light.ufo/glyphs/dcroat.glif
index e65eb3ce..f2583208 100644
--- a/src/Cantarell-Light.ufo/glyphs/dcroat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dcroat.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dcroat" format="2">
-  <advance width="553"/>
+  <advance width="564"/>
   <unicode hex="0111"/>
   <outline>
     <component base="d"/>
-    <component base="strokeshortcomb" xOffset="157" yOffset="293"/>
+    <component base="strokeshortcomb" xOffset="161" yOffset="293"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
index aae89142..dd9356d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ddotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ddotbelow" format="2">
-  <advance width="553"/>
+  <advance width="564"/>
   <unicode hex="1E0D"/>
   <outline>
     <component base="d"/>
-    <component base="dotbelowcomb" xOffset="162"/>
+    <component base="dotbelowcomb" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
index 695efcdc..77faf079 100644
--- a/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dje-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dje-cy" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0452"/>
   <outline>
     <component base="tshe-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
index 261a1e45..1c7b8b34 100644
--- a/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dlinebelow" format="2">
-  <advance width="553"/>
+  <advance width="564"/>
   <unicode hex="1E0F"/>
   <outline>
     <component base="d"/>
-    <component base="macronbelowcomb" xOffset="32"/>
+    <component base="macronbelowcomb" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dzcaron.glif b/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
index c1208121..eb73fab5 100644
--- a/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dzcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzcaron" format="2">
-  <advance width="992"/>
+  <advance width="1015"/>
   <unicode hex="01C6"/>
   <outline>
     <component base="d"/>
-    <component base="zcaron" xOffset="553"/>
+    <component base="zcaron" xOffset="564"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
index 94ae6303..9f373558 100644
--- a/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dze-cy" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="0455"/>
   <outline>
     <component base="s"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
index 2d3094d9..78fab397 100644
--- a/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dzhe-cy.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dzhe-cy" format="2">
-  <advance width="557"/>
+  <advance width="571"/>
   <unicode hex="045F"/>
   <outline>
     <contour>
-      <point x="273" y="-122" type="line"/>
-      <point x="293" y="-122" type="line"/>
-      <point x="293" y="0" type="line"/>
-      <point x="457" y="0" type="line"/>
-      <point x="457" y="480" type="line"/>
-      <point x="437" y="480" type="line"/>
-      <point x="437" y="18" type="line"/>
-      <point x="120" y="18" type="line"/>
-      <point x="120" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
-      <point x="100" y="0" type="line"/>
-      <point x="273" y="0" type="line"/>
+      <point x="280" y="-122" type="line"/>
+      <point x="300" y="-122" type="line"/>
+      <point x="300" y="0" type="line"/>
+      <point x="464" y="0" type="line"/>
+      <point x="464" y="480" type="line"/>
+      <point x="444" y="480" type="line"/>
+      <point x="444" y="18" type="line"/>
+      <point x="127" y="18" type="line"/>
+      <point x="127" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="280" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/e-cy.glif b/src/Cantarell-Light.ufo/glyphs/e-cy.glif
index ee4145e7..0b6091eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/e-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/e-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e-cy" format="2">
-  <advance width="480"/>
+  <advance width="484"/>
   <unicode hex="0454"/>
-  <anchor x="235" y="0" name="bottom"/>
-  <anchor x="250" y="480" name="top"/>
+  <anchor x="239" y="0" name="bottom"/>
+  <anchor x="254" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="-10" type="curve" smooth="yes"/>
-      <point x="332" y="-10"/>
-      <point x="383" y="4"/>
-      <point x="427" y="28" type="curve"/>
-      <point x="422" y="42" type="line"/>
-      <point x="377" y="19"/>
-      <point x="329" y="6"/>
-      <point x="284" y="6" type="curve" smooth="yes"/>
-      <point x="165" y="6"/>
-      <point x="85" y="98"/>
-      <point x="85" y="241" type="curve" smooth="yes"/>
-      <point x="85" y="384"/>
-      <point x="164" y="468"/>
-      <point x="292" y="468" type="curve" smooth="yes"/>
-      <point x="335" y="468"/>
-      <point x="380" y="458"/>
-      <point x="422" y="436" type="curve"/>
-      <point x="429" y="452" type="line"/>
-      <point x="386" y="475"/>
-      <point x="340" y="486"/>
-      <point x="295" y="486" type="curve" smooth="yes"/>
-      <point x="153" y="486"/>
-      <point x="64" y="391"/>
-      <point x="64" y="236" type="curve" smooth="yes"/>
-      <point x="64" y="85"/>
-      <point x="149" y="-10"/>
+      <point x="284" y="-10" type="curve" smooth="yes"/>
+      <point x="336" y="-10"/>
+      <point x="387" y="4"/>
+      <point x="431" y="28" type="curve"/>
+      <point x="426" y="42" type="line"/>
+      <point x="381" y="19"/>
+      <point x="333" y="6"/>
+      <point x="288" y="6" type="curve" smooth="yes"/>
+      <point x="169" y="6"/>
+      <point x="89" y="98"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="384"/>
+      <point x="168" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="339" y="468"/>
+      <point x="384" y="458"/>
+      <point x="426" y="436" type="curve"/>
+      <point x="433" y="452" type="line"/>
+      <point x="390" y="475"/>
+      <point x="344" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="157" y="486"/>
+      <point x="68" y="391"/>
+      <point x="68" y="236" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="153" y="-10"/>
     </contour>
     <contour>
-      <point x="79" y="247" type="line"/>
-      <point x="391" y="247" type="line"/>
-      <point x="391" y="264" type="line"/>
-      <point x="79" y="264" type="line"/>
+      <point x="83" y="247" type="line"/>
+      <point x="395" y="247" type="line"/>
+      <point x="395" y="264" type="line"/>
+      <point x="83" y="264" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/e.glif b/src/Cantarell-Light.ufo/glyphs/e.glif
index e88148c0..7eec30d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/e.glif
+++ b/src/Cantarell-Light.ufo/glyphs/e.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="e" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0065"/>
   <note>
 e
 </note>
-  <anchor x="256" y="0" name="bottom"/>
-  <anchor x="402" y="10" name="ogonek"/>
-  <anchor x="260" y="480" name="top"/>
+  <anchor x="260" y="0" name="bottom"/>
+  <anchor x="406" y="10" name="ogonek"/>
+  <anchor x="264" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="289" y="-10" type="curve" smooth="yes"/>
-      <point x="341" y="-10"/>
-      <point x="390" y="3"/>
-      <point x="430" y="30" type="curve"/>
-      <point x="425" y="44" type="line"/>
-      <point x="382" y="19"/>
-      <point x="337" y="7"/>
-      <point x="291" y="7" type="curve" smooth="yes"/>
-      <point x="164" y="7"/>
-      <point x="85" y="97"/>
-      <point x="85" y="242" type="curve" smooth="yes"/>
-      <point x="85" y="382"/>
-      <point x="153" y="468"/>
-      <point x="263" y="468" type="curve" smooth="yes"/>
-      <point x="367" y="468"/>
-      <point x="432" y="388"/>
-      <point x="432" y="261" type="curve"/>
-      <point x="74" y="261" type="line"/>
-      <point x="74" y="244" type="line"/>
-      <point x="452" y="244" type="line"/>
-      <point x="453" y="251"/>
-      <point x="453" y="256"/>
-      <point x="453" y="264" type="curve" smooth="yes"/>
-      <point x="453" y="396"/>
-      <point x="377" y="486"/>
-      <point x="265" y="486" type="curve" smooth="yes"/>
-      <point x="144" y="486"/>
-      <point x="64" y="387"/>
-      <point x="64" y="239" type="curve" smooth="yes"/>
-      <point x="64" y="87"/>
-      <point x="152" y="-10"/>
+      <point x="293" y="-10" type="curve" smooth="yes"/>
+      <point x="345" y="-10"/>
+      <point x="394" y="3"/>
+      <point x="434" y="30" type="curve"/>
+      <point x="429" y="44" type="line"/>
+      <point x="386" y="19"/>
+      <point x="341" y="7"/>
+      <point x="295" y="7" type="curve" smooth="yes"/>
+      <point x="168" y="7"/>
+      <point x="89" y="97"/>
+      <point x="89" y="242" type="curve" smooth="yes"/>
+      <point x="89" y="382"/>
+      <point x="157" y="468"/>
+      <point x="267" y="468" type="curve" smooth="yes"/>
+      <point x="371" y="468"/>
+      <point x="436" y="388"/>
+      <point x="436" y="261" type="curve"/>
+      <point x="78" y="261" type="line"/>
+      <point x="78" y="244" type="line"/>
+      <point x="456" y="244" type="line"/>
+      <point x="457" y="251"/>
+      <point x="457" y="256"/>
+      <point x="457" y="264" type="curve" smooth="yes"/>
+      <point x="457" y="396"/>
+      <point x="381" y="486"/>
+      <point x="269" y="486" type="curve" smooth="yes"/>
+      <point x="148" y="486"/>
+      <point x="68" y="387"/>
+      <point x="68" y="239" type="curve" smooth="yes"/>
+      <point x="68" y="87"/>
+      <point x="156" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -49,6 +49,8 @@ e
       <string>o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>o</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=o-5</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eacute.glif b/src/Cantarell-Light.ufo/glyphs/eacute.glif
index 303e2dd1..1747dcda 100644
--- a/src/Cantarell-Light.ufo/glyphs/eacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eacute" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="00E9"/>
   <outline>
     <component base="e"/>
-    <component base="acutecomb" xOffset="193"/>
+    <component base="acutecomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ebreve.glif b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
index 05cca1e8..fff79a82 100644
--- a/src/Cantarell-Light.ufo/glyphs/ebreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ebreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ebreve" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0115"/>
   <outline>
     <component base="e"/>
-    <component base="brevecomb" xOffset="74"/>
+    <component base="brevecomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecaron.glif b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
index 8587a895..a6a674c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecaron" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="011B"/>
   <outline>
     <component base="e"/>
-    <component base="caroncomb" xOffset="77"/>
+    <component base="caroncomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif 
b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
index 46287f3f..da4b7f22 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecedillabreve" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1E1D"/>
   <outline>
     <component base="e"/>
-    <component base="cedillacomb" xOffset="131"/>
-    <component base="brevecomb" xOffset="74"/>
+    <component base="cedillacomb" xOffset="135"/>
+    <component base="brevecomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
index 8381acda..56208348 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflex" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="00EA"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb" xOffset="89"/>
+    <component base="circumflexcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
index 1d6e241c..91e0bf52 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexacute" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EBF"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb.loclVIET" xOffset="84"/>
-    <component base="acutecomb.loclVIET" xOffset="303" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="acutecomb.loclVIET" xOffset="307" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
index 658eddb5..2ba67c22 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexdotbelow" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EC7"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="136"/>
-    <component base="circumflexcomb" xOffset="89"/>
+    <component base="dotbelowcomb" xOffset="140"/>
+    <component base="circumflexcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
index 69215406..5a394138 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexgrave" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EC1"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb.loclVIET" xOffset="84"/>
-    <component base="gravecomb.loclVIET" xOffset="199" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="gravecomb.loclVIET" xOffset="203" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
index 99ce2d04..0a3a61b33 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflexhookabove" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EC3"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb.loclVIET" xOffset="84"/>
-    <component base="hookabovecomb.loclVIET" xOffset="230" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="hookabovecomb.loclVIET" xOffset="234" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
index df2df633..ca5b4f09 100644
--- a/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ecircumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ecircumflextilde" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EC5"/>
   <outline>
     <component base="e"/>
-    <component base="circumflexcomb.loclVIET" xOffset="84"/>
-    <component base="tildecomb.loclVIET" xOffset="33" yOffset="80"/>
+    <component base="circumflexcomb.loclVIET" xOffset="88"/>
+    <component base="tildecomb.loclVIET" xOffset="37" yOffset="80"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
index 6e962cd6..b266f691 100644
--- a/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edblgrave" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0205"/>
   <outline>
     <component base="e"/>
-    <component base="dblgravecomb" xOffset="8"/>
+    <component base="dblgravecomb" xOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edieresis.glif b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
index c60549b6..bf138635 100644
--- a/src/Cantarell-Light.ufo/glyphs/edieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edieresis" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="00EB"/>
   <outline>
     <component base="e"/>
-    <component base="dieresiscomb" xOffset="41"/>
+    <component base="dieresiscomb" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
index e6fc40a0..1b2672f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotaccent" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0117"/>
   <outline>
     <component base="e"/>
-    <component base="dotaccentcomb" xOffset="141"/>
+    <component base="dotaccentcomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
index 4ed30cc8..5dfcb3ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/edotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="edotbelow" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EB9"/>
   <outline>
     <component base="e"/>
-    <component base="dotbelowcomb" xOffset="136"/>
+    <component base="dotbelowcomb" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
index f9280233..d19147cc 100644
--- a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
@@ -1,69 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ef-cy" format="2">
-  <advance width="773"/>
+  <advance width="781"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="530" y="-5" type="curve" smooth="yes"/>
-      <point x="636" y="-5"/>
-      <point x="709" y="96"/>
-      <point x="709" y="242" type="curve" smooth="yes"/>
-      <point x="709" y="384"/>
-      <point x="637" y="482"/>
-      <point x="532" y="482" type="curve" smooth="yes"/>
-      <point x="465" y="482"/>
-      <point x="411" y="442"/>
-      <point x="383" y="371" type="curve"/>
-      <point x="387" y="351" type="line"/>
-      <point x="412" y="422"/>
-      <point x="464" y="464"/>
-      <point x="527" y="464" type="curve" smooth="yes"/>
-      <point x="623" y="464"/>
-      <point x="688" y="374"/>
-      <point x="688" y="239" type="curve" smooth="yes"/>
-      <point x="688" y="104"/>
-      <point x="625" y="13"/>
-      <point x="531" y="13" type="curve" smooth="yes"/>
-      <point x="467" y="13"/>
-      <point x="413" y="57"/>
-      <point x="388" y="131" type="curve"/>
-      <point x="384" y="101" type="line"/>
-      <point x="413" y="32"/>
-      <point x="465" y="-5"/>
+      <point x="534" y="-5" type="curve" smooth="yes"/>
+      <point x="640" y="-5"/>
+      <point x="713" y="96"/>
+      <point x="713" y="242" type="curve" smooth="yes"/>
+      <point x="713" y="384"/>
+      <point x="641" y="482"/>
+      <point x="536" y="482" type="curve" smooth="yes"/>
+      <point x="469" y="482"/>
+      <point x="415" y="442"/>
+      <point x="387" y="371" type="curve"/>
+      <point x="391" y="351" type="line"/>
+      <point x="416" y="422"/>
+      <point x="468" y="464"/>
+      <point x="531" y="464" type="curve" smooth="yes"/>
+      <point x="627" y="464"/>
+      <point x="692" y="374"/>
+      <point x="692" y="239" type="curve" smooth="yes"/>
+      <point x="692" y="104"/>
+      <point x="629" y="13"/>
+      <point x="535" y="13" type="curve" smooth="yes"/>
+      <point x="471" y="13"/>
+      <point x="417" y="57"/>
+      <point x="392" y="131" type="curve"/>
+      <point x="388" y="101" type="line"/>
+      <point x="417" y="32"/>
+      <point x="469" y="-5"/>
     </contour>
     <contour>
-      <point x="243" y="-5" type="curve" smooth="yes"/>
-      <point x="302" y="-5"/>
-      <point x="353" y="29"/>
-      <point x="383" y="90" type="curve"/>
-      <point x="379" y="111" type="line"/>
-      <point x="352" y="49"/>
-      <point x="303" y="13"/>
-      <point x="246" y="13" type="curve" smooth="yes"/>
-      <point x="150" y="13"/>
-      <point x="85" y="106"/>
-      <point x="85" y="241" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="149" y="464"/>
-      <point x="242" y="464" type="curve" smooth="yes"/>
-      <point x="301" y="464"/>
-      <point x="352" y="427"/>
-      <point x="379" y="363" type="curve"/>
-      <point x="384" y="392" type="line"/>
-      <point x="354" y="451"/>
-      <point x="305" y="482"/>
-      <point x="245" y="482" type="curve" smooth="yes"/>
-      <point x="138" y="482"/>
-      <point x="64" y="382"/>
-      <point x="64" y="239" type="curve" smooth="yes"/>
-      <point x="64" y="95"/>
-      <point x="138" y="-5"/>
+      <point x="247" y="-5" type="curve" smooth="yes"/>
+      <point x="306" y="-5"/>
+      <point x="357" y="29"/>
+      <point x="387" y="90" type="curve"/>
+      <point x="383" y="111" type="line"/>
+      <point x="356" y="49"/>
+      <point x="307" y="13"/>
+      <point x="250" y="13" type="curve" smooth="yes"/>
+      <point x="154" y="13"/>
+      <point x="89" y="106"/>
+      <point x="89" y="241" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="153" y="464"/>
+      <point x="246" y="464" type="curve" smooth="yes"/>
+      <point x="305" y="464"/>
+      <point x="356" y="427"/>
+      <point x="383" y="363" type="curve"/>
+      <point x="388" y="392" type="line"/>
+      <point x="358" y="451"/>
+      <point x="309" y="482"/>
+      <point x="249" y="482" type="curve" smooth="yes"/>
+      <point x="142" y="482"/>
+      <point x="68" y="382"/>
+      <point x="68" y="239" type="curve" smooth="yes"/>
+      <point x="68" y="95"/>
+      <point x="142" y="-5"/>
     </contour>
     <contour>
-      <point x="377" y="-217" type="line"/>
-      <point x="396" y="-217" type="line"/>
-      <point x="396" y="739" type="line"/>
-      <point x="377" y="739" type="line"/>
+      <point x="381" y="-217" type="line"/>
+      <point x="400" y="-217" type="line"/>
+      <point x="400" y="739" type="line"/>
+      <point x="381" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/egrave.glif b/src/Cantarell-Light.ufo/glyphs/egrave.glif
index 0305c79d..7d26533c 100644
--- a/src/Cantarell-Light.ufo/glyphs/egrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/egrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="egrave" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="00E8"/>
   <outline>
     <component base="e"/>
-    <component base="gravecomb" xOffset="76"/>
+    <component base="gravecomb" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
index dfcd33f6..d3ae0d1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ehookabove" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EBB"/>
   <outline>
     <component base="e"/>
-    <component base="hookabovecomb" xOffset="108"/>
+    <component base="hookabovecomb" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
index 69213768..b107cecd 100644
--- a/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/einvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="einvertedbreve" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0207"/>
   <outline>
     <component base="e"/>
-    <component base="breveinvertedcomb" xOffset="59"/>
+    <component base="breveinvertedcomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/el-cy.glif b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
index b2c0d1c1..f7511c95 100644
--- a/src/Cantarell-Light.ufo/glyphs/el-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/el-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="el-cy" format="2">
-  <advance width="553"/>
+  <advance width="560"/>
   <unicode hex="043B"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Light.ufo/glyphs/em-cy.glif b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
index f163d989..ceb6b5a0 100644
--- a/src/Cantarell-Light.ufo/glyphs/em-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/em-cy.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="em-cy" format="2">
-  <advance width="634"/>
+  <advance width="648"/>
   <unicode hex="043C"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="119" y="0" type="line"/>
-      <point x="119" y="461" type="line"/>
-      <point x="113" y="461" type="line"/>
-      <point x="306" y="75" type="line"/>
-      <point x="323" y="75" type="line"/>
-      <point x="521" y="461" type="line"/>
-      <point x="516" y="461" type="line"/>
-      <point x="516" y="0" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="534" y="480" type="line"/>
-      <point x="513" y="480" type="line"/>
-      <point x="311" y="85" type="line"/>
-      <point x="321" y="85" type="line"/>
-      <point x="123" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="461" type="line"/>
+      <point x="120" y="461" type="line"/>
+      <point x="313" y="75" type="line"/>
+      <point x="330" y="75" type="line"/>
+      <point x="528" y="461" type="line"/>
+      <point x="523" y="461" type="line"/>
+      <point x="523" y="0" type="line"/>
+      <point x="541" y="0" type="line"/>
+      <point x="541" y="480" type="line"/>
+      <point x="520" y="480" type="line"/>
+      <point x="318" y="85" type="line"/>
+      <point x="328" y="85" type="line"/>
+      <point x="130" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacron.glif b/src/Cantarell-Light.ufo/glyphs/emacron.glif
index 16d0b58c..76cb1b62 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacron" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0113"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb" xOffset="17"/>
+    <component base="macroncomb" xOffset="21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
index d51cfce1..795acc71 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacronacute" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1E17"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb.loclVIET" xOffset="22"/>
-    <component base="acutecomb" xOffset="193" yOffset="69"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="acutecomb" xOffset="197" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
index 6690c282..55377736 100644
--- a/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emacrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="emacrongrave" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1E15"/>
   <outline>
     <component base="e"/>
-    <component base="macroncomb.loclVIET" xOffset="22"/>
-    <component base="gravecomb" xOffset="76" yOffset="69"/>
+    <component base="macroncomb.loclVIET" xOffset="26"/>
+    <component base="gravecomb" xOffset="80" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/en-cy.glif b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
index 5be5013e..bf392819 100644
--- a/src/Cantarell-Light.ufo/glyphs/en-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/en-cy.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="en-cy" format="2">
-  <advance width="553"/>
+  <advance width="567"/>
   <unicode hex="043D"/>
-  <anchor x="484" y="0" name="bottomright"/>
+  <anchor x="491" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="432" y="480" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="112" y="245" type="line"/>
-      <point x="440" y="245" type="line"/>
-      <point x="440" y="262" type="line"/>
-      <point x="112" y="262" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
index 745fd94c..102fbb74 100644
--- a/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/endescender-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="endescender-cy" format="2">
-  <advance width="552"/>
+  <advance width="559"/>
   <unicode hex="04A3"/>
   <outline>
     <component base="en-cy"/>
-    <component base="descender-cy" xOffset="388"/>
+    <component base="descender-cy" xOffset="395"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/eng.glif b/src/Cantarell-Light.ufo/glyphs/eng.glif
index 81071d52..fad077bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eng.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eng" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="458" y="0" type="line"/>
-      <point x="458" y="314" type="line" smooth="yes"/>
-      <point x="458" y="421"/>
-      <point x="398" y="486"/>
-      <point x="292" y="486" type="curve" smooth="yes"/>
-      <point x="216" y="486"/>
-      <point x="146" y="454"/>
-      <point x="105" y="399" type="curve"/>
-      <point x="114" y="388" type="line"/>
-      <point x="148" y="436"/>
-      <point x="218" y="468"/>
-      <point x="289" y="468" type="curve" smooth="yes"/>
-      <point x="384" y="468"/>
-      <point x="437" y="411"/>
-      <point x="437" y="314" type="curve" smooth="yes"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="405" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="223" y="486"/>
+      <point x="153" y="454"/>
+      <point x="112" y="399" type="curve"/>
+      <point x="121" y="388" type="line"/>
+      <point x="155" y="436"/>
+      <point x="225" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="391" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="352" y="-217" type="line"/>
-      <point x="416" y="-187"/>
-      <point x="458" y="-110"/>
-      <point x="458" y="-23" type="curve" smooth="yes"/>
-      <point x="458" y="0" type="line"/>
-      <point x="437" y="0" type="line"/>
-      <point x="437" y="-35" type="line" smooth="yes"/>
-      <point x="437" y="-104"/>
-      <point x="401" y="-173"/>
-      <point x="347" y="-207" type="curve"/>
+      <point x="359" y="-217" type="line"/>
+      <point x="423" y="-187"/>
+      <point x="465" y="-110"/>
+      <point x="465" y="-23" type="curve" smooth="yes"/>
+      <point x="465" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="444" y="-35" type="line" smooth="yes"/>
+      <point x="444" y="-104"/>
+      <point x="408" y="-173"/>
+      <point x="354" y="-207" type="curve"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="399" type="line"/>
-      <point x="117" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="399" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
index cf5e168e..f264ec66 100644
--- a/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/enghe-cy.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="enghe-cy" format="2">
-  <advance width="660"/>
+  <advance width="667"/>
   <unicode hex="04A5"/>
   <outline>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="463" type="line"/>
-      <point x="648" y="463" type="line"/>
-      <point x="648" y="480" type="line"/>
-      <point x="432" y="480" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="463" type="line"/>
+      <point x="655" y="463" type="line"/>
+      <point x="655" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="112" y="245" type="line"/>
-      <point x="440" y="245" type="line"/>
-      <point x="440" y="262" type="line"/>
-      <point x="112" y="262" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/eogonek.glif b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
index b0d7e875..d2850435 100644
--- a/src/Cantarell-Light.ufo/glyphs/eogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eogonek" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0119"/>
   <outline>
     <component base="e"/>
-    <component base="ogonekcomb.tall" xOffset="1" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="5" yOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/er-cy.glif b/src/Cantarell-Light.ufo/glyphs/er-cy.glif
index 0044b587..3d9a5de6 100644
--- a/src/Cantarell-Light.ufo/glyphs/er-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/er-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="er-cy" format="2">
-  <advance width="554"/>
+  <advance width="565"/>
   <unicode hex="0440"/>
   <outline>
     <component base="p"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
index 3fd03333..233889c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ereversed-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ereversed-cy" format="2">
-  <advance width="478"/>
+  <advance width="482"/>
   <unicode hex="044D"/>
   <anchor x="242" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/es-cy.glif b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
index 1bbfa7c7..30dc1c11 100644
--- a/src/Cantarell-Light.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="0441"/>
   <anchor x="248" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
index e6e92709..2021f080 100644
--- a/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="460"/>
+  <advance width="464"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/eth.glif b/src/Cantarell-Light.ufo/glyphs/eth.glif
index 44db8907..fafbd7ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/eth.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eth.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eth" format="2">
-  <advance width="550"/>
+  <advance width="564"/>
   <unicode hex="00F0"/>
   <outline>
     <contour>
-      <point x="273" y="-9" type="curve" smooth="yes"/>
-      <point x="396" y="-9"/>
-      <point x="471" y="86"/>
-      <point x="471" y="249" type="curve" smooth="yes"/>
-      <point x="471" y="488"/>
-      <point x="346" y="687"/>
-      <point x="156" y="744" type="curve"/>
-      <point x="150" y="728" type="line"/>
-      <point x="337" y="667"/>
-      <point x="458" y="471"/>
-      <point x="452" y="237" type="curve"/>
-      <point x="454" y="317" type="line"/>
-      <point x="428" y="400"/>
-      <point x="359" y="449"/>
-      <point x="269" y="449" type="curve" smooth="yes"/>
-      <point x="146" y="449"/>
-      <point x="64" y="357"/>
-      <point x="64" y="221" type="curve" smooth="yes"/>
-      <point x="64" y="83"/>
-      <point x="152" y="-9"/>
+      <point x="281" y="-9" type="curve" smooth="yes"/>
+      <point x="404" y="-9"/>
+      <point x="479" y="86"/>
+      <point x="479" y="249" type="curve" smooth="yes"/>
+      <point x="479" y="488"/>
+      <point x="354" y="687"/>
+      <point x="164" y="744" type="curve"/>
+      <point x="158" y="728" type="line"/>
+      <point x="345" y="667"/>
+      <point x="466" y="471"/>
+      <point x="460" y="237" type="curve"/>
+      <point x="462" y="317" type="line"/>
+      <point x="436" y="400"/>
+      <point x="367" y="449"/>
+      <point x="277" y="449" type="curve" smooth="yes"/>
+      <point x="154" y="449"/>
+      <point x="72" y="357"/>
+      <point x="72" y="221" type="curve" smooth="yes"/>
+      <point x="72" y="83"/>
+      <point x="160" y="-9"/>
     </contour>
     <contour>
-      <point x="274" y="9" type="curve" smooth="yes"/>
-      <point x="165" y="9"/>
-      <point x="85" y="94"/>
-      <point x="85" y="226" type="curve" smooth="yes"/>
-      <point x="85" y="351"/>
-      <point x="155" y="431"/>
-      <point x="267" y="431" type="curve" smooth="yes"/>
-      <point x="376" y="431"/>
-      <point x="451" y="355"/>
-      <point x="451" y="221" type="curve" smooth="yes"/>
-      <point x="451" y="94"/>
-      <point x="380" y="9"/>
+      <point x="282" y="9" type="curve" smooth="yes"/>
+      <point x="173" y="9"/>
+      <point x="93" y="94"/>
+      <point x="93" y="226" type="curve" smooth="yes"/>
+      <point x="93" y="351"/>
+      <point x="163" y="431"/>
+      <point x="275" y="431" type="curve" smooth="yes"/>
+      <point x="384" y="431"/>
+      <point x="459" y="355"/>
+      <point x="459" y="221" type="curve" smooth="yes"/>
+      <point x="459" y="94"/>
+      <point x="388" y="9"/>
     </contour>
     <contour>
-      <point x="158" y="602" type="line"/>
-      <point x="389" y="706" type="line"/>
-      <point x="382" y="720" type="line"/>
-      <point x="151" y="616" type="line"/>
+      <point x="166" y="602" type="line"/>
+      <point x="397" y="706" type="line"/>
+      <point x="390" y="720" type="line"/>
+      <point x="159" y="616" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etilde.glif b/src/Cantarell-Light.ufo/glyphs/etilde.glif
index a031af75..ae6acbae 100644
--- a/src/Cantarell-Light.ufo/glyphs/etilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etilde" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="1EBD"/>
   <outline>
     <component base="e"/>
-    <component base="tildecomb" xOffset="25"/>
+    <component base="tildecomb" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/f.glif b/src/Cantarell-Light.ufo/glyphs/f.glif
index a6c2f57d..9a1719ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/f.glif
+++ b/src/Cantarell-Light.ufo/glyphs/f.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="f" format="2">
-  <advance width="305"/>
+  <advance width="314"/>
   <unicode hex="0066"/>
   <note>
 f
 </note>
-  <anchor x="119" y="0" name="bottom"/>
-  <anchor x="226" y="739" name="top"/>
+  <anchor x="125" y="0" name="bottom"/>
+  <anchor x="232" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="109" y="0" type="line"/>
-      <point x="129" y="0" type="line"/>
-      <point x="129" y="636" type="line" smooth="yes"/>
-      <point x="129" y="694"/>
-      <point x="169" y="731"/>
-      <point x="230" y="731" type="curve" smooth="yes"/>
-      <point x="257" y="731"/>
-      <point x="287" y="724"/>
-      <point x="310" y="712" type="curve"/>
-      <point x="316" y="726" type="line"/>
-      <point x="289" y="741"/>
-      <point x="261" y="749"/>
-      <point x="233" y="749" type="curve" smooth="yes"/>
-      <point x="159" y="749"/>
-      <point x="109" y="702"/>
-      <point x="109" y="631" type="curve" smooth="yes"/>
+      <point x="115" y="0" type="line"/>
+      <point x="135" y="0" type="line"/>
+      <point x="135" y="636" type="line" smooth="yes"/>
+      <point x="135" y="694"/>
+      <point x="175" y="731"/>
+      <point x="236" y="731" type="curve" smooth="yes"/>
+      <point x="263" y="731"/>
+      <point x="293" y="724"/>
+      <point x="316" y="712" type="curve"/>
+      <point x="322" y="726" type="line"/>
+      <point x="295" y="741"/>
+      <point x="267" y="749"/>
+      <point x="239" y="749" type="curve" smooth="yes"/>
+      <point x="165" y="749"/>
+      <point x="115" y="702"/>
+      <point x="115" y="631" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="35" y="463" type="line"/>
-      <point x="288" y="463" type="line"/>
-      <point x="288" y="480" type="line"/>
-      <point x="35" y="480" type="line"/>
+      <point x="41" y="463" type="line"/>
+      <point x="294" y="463" type="line"/>
+      <point x="294" y="480" type="line"/>
+      <point x="41" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/fi.glif b/src/Cantarell-Light.ufo/glyphs/fi.glif
index 04b28868..bfdcee8d 100644
--- a/src/Cantarell-Light.ufo/glyphs/fi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fi.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fi" format="2">
-  <advance width="526"/>
+  <advance width="549"/>
   <unicode hex="FB01"/>
   <outline>
     <component base="f"/>
-    <component base="i" xOffset="305"/>
+    <component base="i" xOffset="314"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/fita-cy.glif b/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
index 601d8e6c..4c17b745 100644
--- a/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fita-cy" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="0473"/>
   <outline>
     <component base="obarred-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/fl.glif b/src/Cantarell-Light.ufo/glyphs/fl.glif
index a9626c9f..7474bb47 100644
--- a/src/Cantarell-Light.ufo/glyphs/fl.glif
+++ b/src/Cantarell-Light.ufo/glyphs/fl.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fl" format="2">
-  <advance width="556"/>
+  <advance width="578"/>
   <unicode hex="FB02"/>
   <outline>
     <component base="f"/>
-    <component base="l" xOffset="305"/>
+    <component base="l" xOffset="314"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/g.glif b/src/Cantarell-Light.ufo/glyphs/g.glif
index 09020ca4..e688de67 100644
--- a/src/Cantarell-Light.ufo/glyphs/g.glif
+++ b/src/Cantarell-Light.ufo/glyphs/g.glif
@@ -1,59 +1,59 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="g" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="0067"/>
   <note>
 g
 </note>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="265" y="480" name="top"/>
+  <anchor x="279" y="0" name="bottom"/>
+  <anchor x="269" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="269" y="-227" type="curve" smooth="yes"/>
-      <point x="386" y="-227"/>
-      <point x="456" y="-154"/>
-      <point x="456" y="-32" type="curve" smooth="yes"/>
-      <point x="456" y="482" type="line"/>
-      <point x="440" y="482" type="line"/>
-      <point x="435" y="408" type="line"/>
-      <point x="435" y="-32" type="line" smooth="yes"/>
-      <point x="435" y="-145"/>
-      <point x="376" y="-209"/>
-      <point x="271" y="-209" type="curve" smooth="yes"/>
-      <point x="226" y="-209"/>
-      <point x="182" y="-197"/>
-      <point x="128" y="-170" type="curve"/>
-      <point x="122" y="-187" type="line"/>
-      <point x="174" y="-214"/>
-      <point x="220" y="-227"/>
+      <point x="273" y="-227" type="curve" smooth="yes"/>
+      <point x="390" y="-227"/>
+      <point x="460" y="-154"/>
+      <point x="460" y="-32" type="curve" smooth="yes"/>
+      <point x="460" y="482" type="line"/>
+      <point x="444" y="482" type="line"/>
+      <point x="439" y="408" type="line"/>
+      <point x="439" y="-32" type="line" smooth="yes"/>
+      <point x="439" y="-145"/>
+      <point x="380" y="-209"/>
+      <point x="275" y="-209" type="curve" smooth="yes"/>
+      <point x="230" y="-209"/>
+      <point x="186" y="-197"/>
+      <point x="132" y="-170" type="curve"/>
+      <point x="126" y="-187" type="line"/>
+      <point x="178" y="-214"/>
+      <point x="224" y="-227"/>
     </contour>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="346" y="-10"/>
-      <point x="403" y="23"/>
-      <point x="439" y="85" type="curve"/>
-      <point x="436" y="106" type="line"/>
-      <point x="404" y="44"/>
-      <point x="348" y="8"/>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="346" y="468"/>
-      <point x="404" y="431"/>
-      <point x="436" y="367" type="curve"/>
-      <point x="440" y="396" type="line"/>
-      <point x="406" y="454"/>
-      <point x="350" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/gbreve.glif b/src/Cantarell-Light.ufo/glyphs/gbreve.glif
index 24fb49eb..24791570 100644
--- a/src/Cantarell-Light.ufo/glyphs/gbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gbreve" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="011F"/>
   <outline>
     <component base="g"/>
-    <component base="brevecomb" xOffset="79"/>
+    <component base="brevecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcaron.glif b/src/Cantarell-Light.ufo/glyphs/gcaron.glif
index 662496b0..e0db26cf 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcaron" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="01E7"/>
   <outline>
     <component base="g"/>
-    <component base="caroncomb" xOffset="82"/>
+    <component base="caroncomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
index a002a260..61eb6ae3 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcircumflex" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="011D"/>
   <outline>
     <component base="g"/>
-    <component base="circumflexcomb" xOffset="94"/>
+    <component base="circumflexcomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
index 02d67157..141215b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gcommaaccent" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="0123"/>
   <outline>
     <component base="g"/>
-    <component base="commaturnedabovecomb" xOffset="161"/>
+    <component base="commaturnedabovecomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
index 123de34c..6ba0f5ab 100644
--- a/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gdotaccent" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="0121"/>
   <outline>
     <component base="g"/>
-    <component base="dotaccentcomb" xOffset="146"/>
+    <component base="dotaccentcomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
index c54e0831..cc2f0b6f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ge-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ge-cy" format="2">
-  <advance width="413"/>
+  <advance width="420"/>
   <unicode hex="0433"/>
-  <anchor x="152" y="0" name="bottomright"/>
-  <anchor x="217" y="480" name="top"/>
+  <anchor x="159" y="0" name="bottomright"/>
+  <anchor x="224" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="463" type="line"/>
-      <point x="401" y="463" type="line"/>
-      <point x="401" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="408" y="463" type="line"/>
+      <point x="408" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
index 67fcf564..7697e9d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gedescender-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gedescender-cy" format="2">
-  <advance width="413"/>
+  <advance width="420"/>
   <unicode hex="04F7"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="descender-cy" xOffset="56"/>
+    <component base="descender-cy" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/germandbls.glif b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
index 80b55f33..02c74b00 100644
--- a/src/Cantarell-Light.ufo/glyphs/germandbls.glif
+++ b/src/Cantarell-Light.ufo/glyphs/germandbls.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="germandbls" format="2">
-  <advance width="550"/>
+  <advance width="574"/>
   <unicode hex="00DF"/>
   <outline>
     <contour>
-      <point x="355" y="-10" type="curve" smooth="yes"/>
-      <point x="446" y="-10"/>
-      <point x="511" y="44"/>
-      <point x="511" y="134" type="curve" smooth="yes"/>
-      <point x="511" y="290"/>
-      <point x="313" y="292"/>
-      <point x="313" y="384" type="curve" smooth="yes"/>
-      <point x="313" y="457"/>
-      <point x="436" y="464"/>
-      <point x="436" y="591" type="curve" smooth="yes"/>
-      <point x="436" y="685"/>
-      <point x="369" y="749"/>
-      <point x="275" y="749" type="curve" smooth="yes"/>
-      <point x="167" y="749"/>
-      <point x="100" y="664"/>
-      <point x="100" y="539" type="curve" smooth="yes"/>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="548" type="line" smooth="yes"/>
-      <point x="121" y="659"/>
-      <point x="179" y="731"/>
-      <point x="272" y="731" type="curve" smooth="yes"/>
-      <point x="355" y="731"/>
-      <point x="416" y="673"/>
-      <point x="416" y="588" type="curve" smooth="yes"/>
-      <point x="416" y="468"/>
-      <point x="292" y="465"/>
-      <point x="292" y="381" type="curve" smooth="yes"/>
-      <point x="292" y="275"/>
-      <point x="490" y="281"/>
-      <point x="490" y="131" type="curve" smooth="yes"/>
-      <point x="490" y="54"/>
-      <point x="436" y="8"/>
-      <point x="357" y="8" type="curve" smooth="yes"/>
-      <point x="314" y="8"/>
-      <point x="264" y="21"/>
-      <point x="223" y="43" type="curve"/>
-      <point x="217" y="26" type="line"/>
-      <point x="255" y="4"/>
-      <point x="309" y="-10"/>
+      <point x="362" y="-10" type="curve" smooth="yes"/>
+      <point x="453" y="-10"/>
+      <point x="518" y="44"/>
+      <point x="518" y="134" type="curve" smooth="yes"/>
+      <point x="518" y="290"/>
+      <point x="320" y="292"/>
+      <point x="320" y="384" type="curve" smooth="yes"/>
+      <point x="320" y="457"/>
+      <point x="443" y="464"/>
+      <point x="443" y="591" type="curve" smooth="yes"/>
+      <point x="443" y="685"/>
+      <point x="376" y="749"/>
+      <point x="282" y="749" type="curve" smooth="yes"/>
+      <point x="174" y="749"/>
+      <point x="107" y="664"/>
+      <point x="107" y="539" type="curve" smooth="yes"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="548" type="line" smooth="yes"/>
+      <point x="128" y="659"/>
+      <point x="186" y="731"/>
+      <point x="279" y="731" type="curve" smooth="yes"/>
+      <point x="362" y="731"/>
+      <point x="423" y="673"/>
+      <point x="423" y="588" type="curve" smooth="yes"/>
+      <point x="423" y="468"/>
+      <point x="299" y="465"/>
+      <point x="299" y="381" type="curve" smooth="yes"/>
+      <point x="299" y="275"/>
+      <point x="497" y="281"/>
+      <point x="497" y="131" type="curve" smooth="yes"/>
+      <point x="497" y="54"/>
+      <point x="443" y="8"/>
+      <point x="364" y="8" type="curve" smooth="yes"/>
+      <point x="321" y="8"/>
+      <point x="271" y="21"/>
+      <point x="230" y="43" type="curve"/>
+      <point x="224" y="26" type="line"/>
+      <point x="262" y="4"/>
+      <point x="316" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
index 4888aceb..bf24a5f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="518"/>
+  <advance width="525"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="231" y="-217" type="line"/>
-      <point x="374" y="-210"/>
-      <point x="476" y="-98"/>
-      <point x="476" y="63" type="curve" smooth="yes"/>
-      <point x="476" y="198"/>
-      <point x="399" y="283"/>
-      <point x="275" y="283" type="curve" smooth="yes"/>
-      <point x="210" y="283"/>
-      <point x="146" y="259"/>
-      <point x="107" y="220" type="curve"/>
-      <point x="116" y="209" type="line"/>
-      <point x="149" y="242"/>
-      <point x="213" y="265"/>
-      <point x="273" y="265" type="curve" smooth="yes"/>
-      <point x="384" y="265"/>
-      <point x="455" y="186"/>
-      <point x="455" y="60" type="curve" smooth="yes"/>
-      <point x="455" y="-87"/>
-      <point x="360" y="-193"/>
-      <point x="228" y="-206" type="curve"/>
+      <point x="238" y="-217" type="line"/>
+      <point x="381" y="-210"/>
+      <point x="483" y="-98"/>
+      <point x="483" y="63" type="curve" smooth="yes"/>
+      <point x="483" y="198"/>
+      <point x="406" y="283"/>
+      <point x="282" y="283" type="curve" smooth="yes"/>
+      <point x="217" y="283"/>
+      <point x="153" y="259"/>
+      <point x="114" y="220" type="curve"/>
+      <point x="123" y="209" type="line"/>
+      <point x="156" y="242"/>
+      <point x="220" y="265"/>
+      <point x="280" y="265" type="curve" smooth="yes"/>
+      <point x="391" y="265"/>
+      <point x="462" y="186"/>
+      <point x="462" y="60" type="curve" smooth="yes"/>
+      <point x="462" y="-87"/>
+      <point x="367" y="-193"/>
+      <point x="235" y="-206" type="curve"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="463" type="line"/>
-      <point x="399" y="463" type="line"/>
-      <point x="399" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="406" y="463" type="line"/>
+      <point x="406" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
index a69eeebc..2ea4c459 100644
--- a/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gheupturn-cy.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gheupturn-cy" format="2">
-  <advance width="423"/>
+  <advance width="430"/>
   <unicode hex="0491"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="463" type="line"/>
-      <point x="411" y="463" type="line"/>
-      <point x="411" y="602" type="line"/>
-      <point x="391" y="602" type="line"/>
-      <point x="391" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="463" type="line"/>
+      <point x="418" y="463" type="line"/>
+      <point x="418" y="602" type="line"/>
+      <point x="398" y="602" type="line"/>
+      <point x="398" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
index f9b12d43..4ba88de6 100644
--- a/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gje-cy" format="2">
-  <advance width="413"/>
+  <advance width="420"/>
   <unicode hex="0453"/>
   <outline>
     <component base="ge-cy"/>
-    <component base="acutecomb" xOffset="150"/>
+    <component base="acutecomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gmacron.glif b/src/Cantarell-Light.ufo/glyphs/gmacron.glif
index bc761941..71999a7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/gmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gmacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gmacron" format="2">
-  <advance width="556"/>
+  <advance width="567"/>
   <unicode hex="1E21"/>
   <outline>
     <component base="g"/>
-    <component base="macroncomb" xOffset="22"/>
+    <component base="macroncomb" xOffset="26"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/h.glif b/src/Cantarell-Light.ufo/glyphs/h.glif
index e30f6c4a..da61afcc 100644
--- a/src/Cantarell-Light.ufo/glyphs/h.glif
+++ b/src/Cantarell-Light.ufo/glyphs/h.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="h" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0068"/>
   <note>
 h
 </note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="155" y="592" name="center"/>
-  <anchor x="298" y="739" name="top"/>
+  <anchor x="285" y="0" name="bottom"/>
+  <anchor x="162" y="592" name="center"/>
+  <anchor x="305" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="458" y="0" type="line"/>
-      <point x="458" y="314" type="line" smooth="yes"/>
-      <point x="458" y="421"/>
-      <point x="397" y="486"/>
-      <point x="295" y="486" type="curve" smooth="yes"/>
-      <point x="222" y="486"/>
-      <point x="152" y="452"/>
-      <point x="105" y="394" type="curve"/>
-      <point x="114" y="383" type="line"/>
-      <point x="157" y="436"/>
-      <point x="223" y="468"/>
-      <point x="291" y="468" type="curve" smooth="yes"/>
-      <point x="383" y="468"/>
-      <point x="437" y="411"/>
-      <point x="437" y="314" type="curve" smooth="yes"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="404" y="486"/>
+      <point x="302" y="486" type="curve" smooth="yes"/>
+      <point x="229" y="486"/>
+      <point x="159" y="452"/>
+      <point x="112" y="394" type="curve"/>
+      <point x="121" y="383" type="line"/>
+      <point x="164" y="436"/>
+      <point x="230" y="468"/>
+      <point x="298" y="468" type="curve" smooth="yes"/>
+      <point x="390" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="120" y="0" type="line"/>
-      <point x="120" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ha-cy.glif b/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
index e9e04c37..92b118d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ha-cy" format="2">
-  <advance width="442"/>
+  <advance width="446"/>
   <unicode hex="0445"/>
   <anchor x="414" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/hbar.glif b/src/Cantarell-Light.ufo/glyphs/hbar.glif
index 9e85f9ec..b69b5b91 100644
--- a/src/Cantarell-Light.ufo/glyphs/hbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbar" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0127"/>
   <outline>
     <component base="h"/>
-    <component base="strokeshortcomb" xOffset="-86" yOffset="293"/>
+    <component base="strokeshortcomb" xOffset="-79" yOffset="293"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif b/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
index 8823d828..c9e833bc 100644
--- a/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hbrevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hbrevebelow" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="1E2B"/>
   <outline>
     <component base="h"/>
-    <component base="brevebelowcomb" xOffset="72"/>
+    <component base="brevebelowcomb" xOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
index 4f793686..fb24783c 100644
--- a/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hcircumflex" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0125"/>
   <outline>
     <component base="h"/>
-    <component base="circumflexcomb.case" xOffset="121" yOffset="45"/>
+    <component base="circumflexcomb.case" xOffset="128" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
index 3160fbc3..eae900a4 100644
--- a/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="hdotbelow" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="1E25"/>
   <outline>
     <component base="h"/>
-    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/i-cy.glif b/src/Cantarell-Light.ufo/glyphs/i-cy.glif
index 23240069..459cab53 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="221"/>
+  <advance width="235"/>
   <unicode hex="0456"/>
   <outline>
     <component base="i"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/i.glif b/src/Cantarell-Light.ufo/glyphs/i.glif
index ef450c89..347e70a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/i.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="i" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0069"/>
   <note>
 i
 </note>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-7"/>
+    <component base="dotaccentcomb"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
index 36f533cd..416cc031 100644
--- a/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ia-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ia-cy" format="2">
-  <advance width="489"/>
+  <advance width="496"/>
   <unicode hex="044F"/>
   <anchor x="238" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/iacute.glif b/src/Cantarell-Light.ufo/glyphs/iacute.glif
index fc3ca9ec..e10a98ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/iacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iacute" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="00ED"/>
   <outline>
     <component base="idotless"/>
-    <component base="acutecomb" xOffset="45"/>
+    <component base="acutecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ibreve.glif b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
index a09b6688..12067356 100644
--- a/src/Cantarell-Light.ufo/glyphs/ibreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ibreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ibreve" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="012D"/>
   <outline>
     <component base="idotless"/>
-    <component base="brevecomb" xOffset="-74"/>
+    <component base="brevecomb" xOffset="-67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icaron.glif b/src/Cantarell-Light.ufo/glyphs/icaron.glif
index bf7b4883..b2564857 100644
--- a/src/Cantarell-Light.ufo/glyphs/icaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icaron" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="01D0"/>
   <outline>
     <component base="idotless"/>
-    <component base="caroncomb" xOffset="-71"/>
+    <component base="caroncomb" xOffset="-64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
index 22d82529..3d920170 100644
--- a/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/icircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="icircumflex" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="00EE"/>
   <outline>
     <component base="idotless"/>
-    <component base="circumflexcomb" xOffset="-59"/>
+    <component base="circumflexcomb" xOffset="-52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
index 33533678..7b11265b 100644
--- a/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idblgrave" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0209"/>
   <outline>
     <component base="idotless"/>
-    <component base="dblgravecomb" xOffset="-140"/>
+    <component base="dblgravecomb" xOffset="-133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
index 07b11c5f..e51bd539 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis-cy" format="2">
-  <advance width="560"/>
+  <advance width="574"/>
   <unicode hex="04E5"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="dieresiscomb" xOffset="61"/>
+    <component base="dieresiscomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresis.glif b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
index ffa45166..cc297e24 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresis" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="00EF"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-107"/>
+    <component base="dieresiscomb" xOffset="-100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
index eae60090..581d333d 100644
--- a/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idieresisacute" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="1E2F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb.loclVIET" xOffset="-107"/>
-    <component base="acutecomb" xOffset="45" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="-100"/>
+    <component base="acutecomb" xOffset="52" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
index d1d329cd..853f2e2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotaccent.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotaccent" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-7"/>
+    <component base="dotaccentcomb"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
index 530e8e54..c10da12f 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotbelow" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="1ECB"/>
   <outline>
     <component base="i"/>
-    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="1"/>
+    <component base="dotbelowcomb" xScale="0.91" yScale="0.91" xOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/idotless.glif b/src/Cantarell-Light.ufo/glyphs/idotless.glif
index 456d0ea9..9667451f 100644
--- a/src/Cantarell-Light.ufo/glyphs/idotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/idotless.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="idotless" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0131"/>
   <note>
 dotlessi
 </note>
-  <anchor x="110" y="0" name="bottom"/>
-  <anchor x="115" y="10" name="ogonek"/>
-  <anchor x="112" y="480" name="top"/>
+  <anchor x="117" y="0" name="bottom"/>
+  <anchor x="122" y="10" name="ogonek"/>
+  <anchor x="119" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
index 5fa89fa5..d539e29f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ie-cy" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0435"/>
   <anchor x="247" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
index 90451975..2796f9fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iebreve-cy" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="04D7"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
index 2f46a3a0..6ed01eca 100644
--- a/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iegrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iegrave-cy" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0450"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/igrave.glif b/src/Cantarell-Light.ufo/glyphs/igrave.glif
index e50a80fd..87667594 100644
--- a/src/Cantarell-Light.ufo/glyphs/igrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/igrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="igrave" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="00EC"/>
   <outline>
     <component base="idotless"/>
-    <component base="gravecomb" xOffset="-72"/>
+    <component base="gravecomb" xOffset="-65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
index 489b2958..754fe1c6 100644
--- a/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ihookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ihookabove" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="1EC9"/>
   <outline>
     <component base="idotless"/>
-    <component base="hookabovecomb" xOffset="-40"/>
+    <component base="hookabovecomb" xOffset="-33"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ii-cy.glif b/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
index 70b50d1d..6ec4c1a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ii-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ii-cy" format="2">
-  <advance width="560"/>
+  <advance width="574"/>
   <unicode hex="0438"/>
-  <anchor x="521" y="0" name="bottomright"/>
-  <anchor x="280" y="480" name="top"/>
+  <anchor x="528" y="0" name="bottomright"/>
+  <anchor x="287" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="122" y="0" type="line"/>
-      <point x="443" y="460" type="line"/>
-      <point x="441" y="460" type="line"/>
-      <point x="441" y="0" type="line"/>
-      <point x="460" y="0" type="line"/>
-      <point x="460" y="480" type="line"/>
-      <point x="438" y="480" type="line"/>
-      <point x="117" y="19" type="line"/>
-      <point x="119" y="20" type="line"/>
-      <point x="119" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="129" y="0" type="line"/>
+      <point x="450" y="460" type="line"/>
+      <point x="448" y="460" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="467" y="0" type="line"/>
+      <point x="467" y="480" type="line"/>
+      <point x="445" y="480" type="line"/>
+      <point x="124" y="19" type="line"/>
+      <point x="126" y="20" type="line"/>
+      <point x="126" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif b/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
index a5f98e97..8b435d87 100644
--- a/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iigrave-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iigrave-cy" format="2">
-  <advance width="560"/>
+  <advance width="574"/>
   <unicode hex="045D"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="gravecomb" xOffset="96"/>
+    <component base="gravecomb" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
index bf69a76f..026fed8e 100644
--- a/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iinvertedbreve" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="020B"/>
   <outline>
     <component base="idotless"/>
-    <component base="breveinvertedcomb" xOffset="-89"/>
+    <component base="breveinvertedcomb" xOffset="-82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif b/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
index c084c399..af43b6b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iishort-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iishort-cy" format="2">
-  <advance width="560"/>
+  <advance width="574"/>
   <unicode hex="0439"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="brevecomb-cy" xOffset="83"/>
+    <component base="brevecomb-cy" xOffset="90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif b/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
index 244b6998..c6ba16ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/imacron-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron-cy" format="2">
-  <advance width="560"/>
+  <advance width="574"/>
   <unicode hex="04E3"/>
   <outline>
     <component base="ii-cy"/>
-    <component base="macroncomb" xOffset="37"/>
+    <component base="macroncomb" xOffset="44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/imacron.glif b/src/Cantarell-Light.ufo/glyphs/imacron.glif
index 8c15080f..42edb38f 100644
--- a/src/Cantarell-Light.ufo/glyphs/imacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/imacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="imacron" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="012B"/>
   <outline>
     <component base="idotless"/>
-    <component base="macroncomb.narrow" xOffset="-85"/>
+    <component base="macroncomb.narrow" xOffset="-78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/io-cy.glif b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
index fec74a52..e2429943 100644
--- a/src/Cantarell-Light.ufo/glyphs/io-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/io-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="io-cy" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0451"/>
   <outline>
     <component base="ie-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/iogonek.glif b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
index b84f1789..f90abcbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/iogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iogonek" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="012F"/>
   <outline>
     <component base="idotless"/>
-    <component base="dotaccentcomb" xOffset="-7"/>
-    <component base="ogonekcomb.narrow" xOffset="-261"/>
+    <component base="dotaccentcomb"/>
+    <component base="ogonekcomb.narrow" xOffset="-254"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/itilde.glif b/src/Cantarell-Light.ufo/glyphs/itilde.glif
index afba4cb8..dd4c0d7a 100644
--- a/src/Cantarell-Light.ufo/glyphs/itilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/itilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="itilde" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0129"/>
   <outline>
     <component base="idotless"/>
-    <component base="tildecomb" xOffset="-123"/>
+    <component base="tildecomb" xOffset="-116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iu-cy.glif b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
index 4062dbc3..8cd31a39 100644
--- a/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iu-cy.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iu-cy" format="2">
-  <advance width="728"/>
+  <advance width="739"/>
   <unicode hex="044E"/>
-  <anchor x="377" y="480" name="top"/>
+  <anchor x="384" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="451" y="-7" type="curve" smooth="yes"/>
-      <point x="578" y="-7"/>
-      <point x="664" y="95"/>
-      <point x="664" y="244" type="curve" smooth="yes"/>
-      <point x="664" y="391"/>
-      <point x="580" y="490"/>
-      <point x="454" y="490" type="curve" smooth="yes"/>
-      <point x="330" y="490"/>
-      <point x="252" y="393"/>
-      <point x="252" y="240" type="curve" smooth="yes"/>
-      <point x="252" y="88"/>
-      <point x="329" y="-7"/>
+      <point x="458" y="-7" type="curve" smooth="yes"/>
+      <point x="585" y="-7"/>
+      <point x="671" y="95"/>
+      <point x="671" y="244" type="curve" smooth="yes"/>
+      <point x="671" y="391"/>
+      <point x="587" y="490"/>
+      <point x="461" y="490" type="curve" smooth="yes"/>
+      <point x="337" y="490"/>
+      <point x="259" y="393"/>
+      <point x="259" y="240" type="curve" smooth="yes"/>
+      <point x="259" y="88"/>
+      <point x="336" y="-7"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="113" y="244" type="line"/>
-      <point x="262" y="244" type="line"/>
-      <point x="262" y="262" type="line"/>
-      <point x="113" y="262" type="line"/>
+      <point x="120" y="244" type="line"/>
+      <point x="269" y="244" type="line"/>
+      <point x="269" y="262" type="line"/>
+      <point x="120" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="453" y="12" type="curve" smooth="yes"/>
-      <point x="342" y="12"/>
-      <point x="274" y="101"/>
-      <point x="274" y="243" type="curve" smooth="yes"/>
-      <point x="274" y="384"/>
-      <point x="341" y="471"/>
-      <point x="451" y="471" type="curve" smooth="yes"/>
-      <point x="565" y="471"/>
-      <point x="643" y="376"/>
-      <point x="643" y="240" type="curve" smooth="yes"/>
-      <point x="643" y="103"/>
-      <point x="566" y="12"/>
+      <point x="460" y="12" type="curve" smooth="yes"/>
+      <point x="349" y="12"/>
+      <point x="281" y="101"/>
+      <point x="281" y="243" type="curve" smooth="yes"/>
+      <point x="281" y="384"/>
+      <point x="348" y="471"/>
+      <point x="458" y="471" type="curve" smooth="yes"/>
+      <point x="572" y="471"/>
+      <point x="650" y="376"/>
+      <point x="650" y="240" type="curve" smooth="yes"/>
+      <point x="650" y="103"/>
+      <point x="573" y="12"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
index fb05b669..31d4bed8 100644
--- a/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/izhitsa-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="470"/>
+  <advance width="478"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
-      <point x="205" y="0" type="line"/>
-      <point x="218" y="0" type="line"/>
-      <point x="346" y="367" type="line" smooth="yes"/>
-      <point x="372" y="441"/>
-      <point x="406" y="476"/>
-      <point x="453" y="476" type="curve"/>
-      <point x="451" y="494" type="line"/>
-      <point x="399" y="494"/>
-      <point x="356" y="452"/>
-      <point x="328" y="370" type="curve" smooth="yes"/>
-      <point x="208" y="20" type="line"/>
-      <point x="217" y="20" type="line"/>
-      <point x="46" y="486" type="line"/>
-      <point x="24" y="486" type="line"/>
+      <point x="213" y="0" type="line"/>
+      <point x="226" y="0" type="line"/>
+      <point x="354" y="367" type="line" smooth="yes"/>
+      <point x="380" y="441"/>
+      <point x="414" y="476"/>
+      <point x="461" y="476" type="curve"/>
+      <point x="459" y="494" type="line"/>
+      <point x="407" y="494"/>
+      <point x="364" y="452"/>
+      <point x="336" y="370" type="curve" smooth="yes"/>
+      <point x="216" y="20" type="line"/>
+      <point x="225" y="20" type="line"/>
+      <point x="54" y="486" type="line"/>
+      <point x="32" y="486" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/j.glif b/src/Cantarell-Light.ufo/glyphs/j.glif
index ffcbbed6..d6d4cba5 100644
--- a/src/Cantarell-Light.ufo/glyphs/j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/j.glif
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="j" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="006A"/>
   <note>
 j
 </note>
   <outline>
     <component base="jdotless"/>
-    <component base="dotaccentcomb" xOffset="-9"/>
+    <component base="dotaccentcomb" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jacute.glif b/src/Cantarell-Light.ufo/glyphs/jacute.glif
index 3e818e39..590b4537 100644
--- a/src/Cantarell-Light.ufo/glyphs/jacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jacute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jacute" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <outline>
     <component base="jdotless"/>
-    <component base="acutecomb" xOffset="43"/>
+    <component base="acutecomb" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
index 17d3c479..8f162893 100644
--- a/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jcircumflex" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0135"/>
   <outline>
     <component base="jdotless"/>
-    <component base="circumflexcomb" xOffset="-61"/>
+    <component base="circumflexcomb" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/jdotless.glif b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
index 3adff822..b1ef0dac 100644
--- a/src/Cantarell-Light.ufo/glyphs/jdotless.glif
+++ b/src/Cantarell-Light.ufo/glyphs/jdotless.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="jdotless" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0237"/>
   <note>
 uni0237
 </note>
-  <anchor x="110" y="0" name="bottom"/>
-  <anchor x="110" y="480" name="top"/>
+  <anchor x="117" y="0" name="bottom"/>
+  <anchor x="117" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="14" y="-219" type="line"/>
-      <point x="78" y="-191"/>
-      <point x="121" y="-129"/>
-      <point x="121" y="-64" type="curve" smooth="yes"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
-      <point x="100" y="-64" type="line" smooth="yes"/>
-      <point x="100" y="-122"/>
-      <point x="63" y="-178"/>
-      <point x="7" y="-206" type="curve"/>
+      <point x="21" y="-219" type="line"/>
+      <point x="85" y="-191"/>
+      <point x="128" y="-129"/>
+      <point x="128" y="-64" type="curve" smooth="yes"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="-64" type="line" smooth="yes"/>
+      <point x="107" y="-122"/>
+      <point x="70" y="-178"/>
+      <point x="14" y="-206" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/je-cy.glif b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
index fe6f48d8..e2e5dfb6 100644
--- a/src/Cantarell-Light.ufo/glyphs/je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/je-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="je-cy" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0458"/>
   <outline>
     <component base="j"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/k.glif b/src/Cantarell-Light.ufo/glyphs/k.glif
index 9d016d5e..6cb997b1 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="463"/>
+  <advance width="464"/>
   <unicode hex="006B"/>
   <note>
 k
 </note>
-  <anchor x="217" y="0" name="bottom"/>
-  <anchor x="197" y="739" name="top"/>
+  <anchor x="224" y="0" name="bottom"/>
+  <anchor x="204" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="408" y="0" type="line"/>
-      <point x="437" y="0" type="line"/>
-      <point x="141" y="267" type="line"/>
-      <point x="139" y="249" type="line"/>
-      <point x="415" y="480" type="line"/>
-      <point x="388" y="480" type="line"/>
-      <point x="122" y="257" type="line"/>
+      <point x="415" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="148" y="267" type="line"/>
+      <point x="146" y="249" type="line"/>
+      <point x="422" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="129" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="120" y="0" type="line"/>
-      <point x="120" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
index f22ca67b..16ac3e1d 100644
--- a/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ka-cy.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ka-cy" format="2">
-  <advance width="453"/>
+  <advance width="460"/>
   <unicode hex="043A"/>
-  <anchor x="452" y="0" name="bottomright"/>
-  <anchor x="237" y="480" name="top"/>
+  <anchor x="459" y="0" name="bottomright"/>
+  <anchor x="244" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="413" y="0" type="line"/>
-      <point x="437" y="0" type="line"/>
-      <point x="257" y="260" type="line"/>
-      <point x="257" y="251" type="line"/>
-      <point x="425" y="480" type="line"/>
-      <point x="402" y="480" type="line"/>
-      <point x="238" y="254" type="line"/>
+      <point x="420" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="264" y="260" type="line"/>
+      <point x="264" y="251" type="line"/>
+      <point x="432" y="480" type="line"/>
+      <point x="409" y="480" type="line"/>
+      <point x="245" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="119" y="0" type="line"/>
-      <point x="119" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="108" y="245" type="line"/>
-      <point x="251" y="245" type="line"/>
-      <point x="251" y="262" type="line"/>
-      <point x="108" y="262" type="line"/>
+      <point x="115" y="245" type="line"/>
+      <point x="258" y="245" type="line"/>
+      <point x="258" y="262" type="line"/>
+      <point x="115" y="262" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kacute.glif b/src/Cantarell-Light.ufo/glyphs/kacute.glif
index 203187e2..923ea6fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/kacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kacute" format="2">
-  <advance width="463"/>
+  <advance width="464"/>
   <unicode hex="1E31"/>
   <outline>
     <component base="k"/>
-    <component base="acutecomb.case" xOffset="139" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="146" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
index 365fa4a6..341e5388 100644
--- a/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kadescender-cy.glif
@@ -4,7 +4,7 @@
   <unicode hex="049B"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="descender-cy" xOffset="356"/>
+    <component base="descender-cy" xOffset="363"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
index 757a54d8..22ef04d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kaverticalstroke-cy.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaverticalstroke-cy" format="2">
-  <advance width="463"/>
+  <advance width="470"/>
   <unicode hex="049D"/>
   <outline>
     <contour>
-      <point x="423" y="0" type="line"/>
-      <point x="447" y="0" type="line"/>
-      <point x="277" y="260" type="line"/>
-      <point x="277" y="251" type="line"/>
-      <point x="435" y="480" type="line"/>
-      <point x="412" y="480" type="line"/>
-      <point x="258" y="254" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="454" y="0" type="line"/>
+      <point x="284" y="260" type="line"/>
+      <point x="284" y="251" type="line"/>
+      <point x="442" y="480" type="line"/>
+      <point x="419" y="480" type="line"/>
+      <point x="265" y="254" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="119" y="0" type="line"/>
-      <point x="119" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="108" y="245" type="line"/>
-      <point x="271" y="245" type="line"/>
-      <point x="271" y="262" type="line"/>
-      <point x="108" y="262" type="line"/>
+      <point x="115" y="245" type="line"/>
+      <point x="278" y="245" type="line"/>
+      <point x="278" y="262" type="line"/>
+      <point x="115" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="204" y="90" type="line"/>
-      <point x="223" y="90" type="line"/>
-      <point x="223" y="410" type="line"/>
-      <point x="204" y="410" type="line"/>
+      <point x="211" y="90" type="line"/>
+      <point x="230" y="90" type="line"/>
+      <point x="230" y="410" type="line"/>
+      <point x="211" y="410" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
index 5a2b90e5..22f4240a 100644
--- a/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kcommaaccent" format="2">
-  <advance width="463"/>
+  <advance width="464"/>
   <unicode hex="0137"/>
   <outline>
     <component base="k"/>
-    <component base="commaaccentcomb" xOffset="88"/>
+    <component base="commaaccentcomb" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
index 9596bcc1..29360007 100644
--- a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="463"/>
+  <advance width="464"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
-      <point x="408" y="0" type="line"/>
-      <point x="437" y="0" type="line"/>
-      <point x="141" y="267" type="line"/>
-      <point x="139" y="249" type="line"/>
-      <point x="415" y="480" type="line"/>
-      <point x="388" y="480" type="line"/>
-      <point x="122" y="257" type="line"/>
+      <point x="415" y="0" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="148" y="267" type="line"/>
+      <point x="146" y="249" type="line"/>
+      <point x="422" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="129" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="120" y="0" type="line"/>
-      <point x="120" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
index 02421e69..255c81bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kje-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kje-cy" format="2">
-  <advance width="453"/>
+  <advance width="460"/>
   <unicode hex="045C"/>
   <outline>
     <component base="ka-cy"/>
-    <component base="acutecomb" xOffset="170"/>
+    <component base="acutecomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.glif b/src/Cantarell-Light.ufo/glyphs/l.glif
index 3c0a1e50..c91bef7c 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="006C"/>
   <note>
 l
 </note>
-  <anchor x="150" y="0" name="bottom"/>
-  <anchor x="133" y="383" name="center"/>
-  <anchor x="242" y="353" name="periodcentered"/>
-  <anchor x="111" y="739" name="top"/>
-  <anchor x="223" y="480" name="topright"/>
+  <anchor x="157" y="0" name="bottom"/>
+  <anchor x="140" y="383" name="center"/>
+  <anchor x="249" y="353" name="periodcentered"/>
+  <anchor x="118" y="739" name="top"/>
+  <anchor x="230" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="177" y="-2" type="curve" smooth="yes"/>
-      <point x="194" y="-2"/>
-      <point x="212" y="2"/>
-      <point x="226" y="8" type="curve"/>
-      <point x="221" y="22" type="line"/>
-      <point x="210" y="17"/>
-      <point x="195" y="14"/>
-      <point x="182" y="14" type="curve" smooth="yes"/>
-      <point x="143" y="14"/>
-      <point x="120" y="43"/>
-      <point x="120" y="87" type="curve" smooth="yes"/>
-      <point x="120" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
-      <point x="100" y="83" type="line" smooth="yes"/>
-      <point x="100" y="31"/>
-      <point x="129" y="-2"/>
+      <point x="184" y="-2" type="curve" smooth="yes"/>
+      <point x="201" y="-2"/>
+      <point x="219" y="2"/>
+      <point x="233" y="8" type="curve"/>
+      <point x="228" y="22" type="line"/>
+      <point x="217" y="17"/>
+      <point x="202" y="14"/>
+      <point x="189" y="14" type="curve" smooth="yes"/>
+      <point x="150" y="14"/>
+      <point x="127" y="43"/>
+      <point x="127" y="87" type="curve" smooth="yes"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
+      <point x="107" y="83" type="line" smooth="yes"/>
+      <point x="107" y="31"/>
+      <point x="136" y="-2"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/l.ss01.glif b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
index 843ffcda..e70a410a 100644
--- a/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
+++ b/src/Cantarell-Light.ufo/glyphs/l.ss01.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="l.ss01" format="2">
-  <advance width="220"/>
+  <advance width="234"/>
   <note>
 l
 </note>
-  <anchor x="150" y="0" name="bottom"/>
-  <anchor x="133" y="383" name="center"/>
-  <anchor x="252" y="353" name="periodcentered"/>
-  <anchor x="111" y="739" name="top"/>
-  <anchor x="223" y="480" name="topright"/>
+  <anchor x="157" y="0" name="bottom"/>
+  <anchor x="140" y="383" name="center"/>
+  <anchor x="259" y="353" name="periodcentered"/>
+  <anchor x="118" y="739" name="top"/>
+  <anchor x="230" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="120" y="0" type="line"/>
-      <point x="120" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/lacute.glif b/src/Cantarell-Light.ufo/glyphs/lacute.glif
index c2b2dafb..cc1ff482 100644
--- a/src/Cantarell-Light.ufo/glyphs/lacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lacute" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="013A"/>
   <outline>
     <component base="l"/>
-    <component base="acutecomb.case" xOffset="53" yOffset="45"/>
+    <component base="acutecomb.case" xOffset="60" yOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
index 9cc88559..b835d92e 100644
--- a/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
+++ b/src/Cantarell-Light.ufo/glyphs/layerinfo.plist
@@ -1427,7 +1427,7 @@
       <key>com.schriftgestaltung.layerOrderInGlyph.numero</key>
       <integer>2</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.o</key>
-      <integer>2</integer>
+      <integer>3</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.o-cy</key>
       <integer>0</integer>
       <key>com.schriftgestaltung.layerOrderInGlyph.oacute</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcaron.glif b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
index 4e5919c2..abc09552 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcaron.glif
@@ -4,7 +4,7 @@
   <unicode hex="013E"/>
   <outline>
     <component base="l"/>
-    <component base="caroncomb.alt" xOffset="111"/>
+    <component base="caroncomb.alt" xOffset="118"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
index c28489ba..ed4568fb 100644
--- a/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lcommaaccent" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="013C"/>
   <outline>
     <component base="l"/>
-    <component base="commaaccentcomb" xOffset="21"/>
+    <component base="commaaccentcomb" xOffset="28"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldot.glif b/src/Cantarell-Light.ufo/glyphs/ldot.glif
index d27bac3f..70a2bbec 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldot.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldot" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="0140"/>
   <outline>
     <component base="l"/>
-    <component base="periodcentered.loclCAT" xOffset="242"/>
+    <component base="periodcentered.loclCAT" xOffset="249"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
index 7065b4fc..e0e5ff42 100644
--- a/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ldotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ldotbelow" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="1E37"/>
   <outline>
     <component base="l"/>
-    <component base="dotbelowcomb" xOffset="30"/>
+    <component base="dotbelowcomb" xOffset="37"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lj.glif b/src/Cantarell-Light.ufo/glyphs/lj.glif
index 043b11d0..f2ba83fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/lj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lj" format="2">
-  <advance width="472"/>
+  <advance width="499"/>
   <unicode hex="01C9"/>
   <outline>
     <component base="l"/>
-    <component base="j" xOffset="251"/>
+    <component base="j" xOffset="264"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
index 282f4c1f..25dc51ee 100644
--- a/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/llinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="llinebelow" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="1E3B"/>
   <outline>
     <component base="l"/>
-    <component base="macronbelowcomb.narrow" xOffset="-71"/>
+    <component base="macronbelowcomb.narrow" xOffset="-64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lslash.glif b/src/Cantarell-Light.ufo/glyphs/lslash.glif
index 094a5126..55465b17 100644
--- a/src/Cantarell-Light.ufo/glyphs/lslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lslash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lslash" format="2">
-  <advance width="251"/>
+  <advance width="264"/>
   <unicode hex="0142"/>
   <outline>
     <component base="l"/>
-    <component base="slashshortcomb" xOffset="-69" yOffset="87"/>
+    <component base="slashshortcomb" xOffset="-62" yOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/m.glif b/src/Cantarell-Light.ufo/glyphs/m.glif
index 5d5e93bb..62596d7c 100644
--- a/src/Cantarell-Light.ufo/glyphs/m.glif
+++ b/src/Cantarell-Light.ufo/glyphs/m.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="m" format="2">
-  <advance width="867"/>
+  <advance width="880"/>
   <unicode hex="006D"/>
   <note>
 m
 </note>
-  <anchor x="445" y="0" name="bottom"/>
-  <anchor x="445" y="480" name="top"/>
+  <anchor x="452" y="0" name="bottom"/>
+  <anchor x="452" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="754" y="0" type="line"/>
-      <point x="775" y="0" type="line"/>
-      <point x="775" y="314" type="line" smooth="yes"/>
-      <point x="775" y="424"/>
-      <point x="714" y="486"/>
-      <point x="615" y="486" type="curve" smooth="yes"/>
-      <point x="545" y="486"/>
-      <point x="477" y="454"/>
-      <point x="429" y="399" type="curve"/>
-      <point x="435" y="386" type="line"/>
-      <point x="481" y="437"/>
-      <point x="546" y="468"/>
-      <point x="611" y="468" type="curve" smooth="yes"/>
-      <point x="700" y="468"/>
-      <point x="754" y="411"/>
-      <point x="754" y="314" type="curve" smooth="yes"/>
+      <point x="761" y="0" type="line"/>
+      <point x="782" y="0" type="line"/>
+      <point x="782" y="314" type="line" smooth="yes"/>
+      <point x="782" y="424"/>
+      <point x="721" y="486"/>
+      <point x="622" y="486" type="curve" smooth="yes"/>
+      <point x="552" y="486"/>
+      <point x="484" y="454"/>
+      <point x="436" y="399" type="curve"/>
+      <point x="442" y="386" type="line"/>
+      <point x="488" y="437"/>
+      <point x="553" y="468"/>
+      <point x="618" y="468" type="curve" smooth="yes"/>
+      <point x="707" y="468"/>
+      <point x="761" y="411"/>
+      <point x="761" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="404" type="line"/>
-      <point x="117" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="404" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="427" y="0" type="line"/>
-      <point x="448" y="0" type="line"/>
-      <point x="448" y="314" type="line" smooth="yes"/>
-      <point x="448" y="424"/>
-      <point x="387" y="486"/>
-      <point x="289" y="486" type="curve" smooth="yes"/>
-      <point x="219" y="486"/>
-      <point x="151" y="456"/>
-      <point x="104" y="404" type="curve"/>
-      <point x="112" y="393" type="line"/>
-      <point x="157" y="440"/>
-      <point x="221" y="468"/>
-      <point x="285" y="468" type="curve" smooth="yes"/>
-      <point x="373" y="468"/>
-      <point x="427" y="411"/>
-      <point x="427" y="314" type="curve" smooth="yes"/>
+      <point x="434" y="0" type="line"/>
+      <point x="455" y="0" type="line"/>
+      <point x="455" y="314" type="line" smooth="yes"/>
+      <point x="455" y="424"/>
+      <point x="394" y="486"/>
+      <point x="296" y="486" type="curve" smooth="yes"/>
+      <point x="226" y="486"/>
+      <point x="158" y="456"/>
+      <point x="111" y="404" type="curve"/>
+      <point x="119" y="393" type="line"/>
+      <point x="164" y="440"/>
+      <point x="228" y="468"/>
+      <point x="292" y="468" type="curve" smooth="yes"/>
+      <point x="380" y="468"/>
+      <point x="434" y="411"/>
+      <point x="434" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
index f0512325..d7d3ec63 100644
--- a/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/mdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mdotbelow" format="2">
-  <advance width="867"/>
+  <advance width="880"/>
   <unicode hex="1E43"/>
   <outline>
     <component base="m"/>
-    <component base="dotbelowcomb" xOffset="325"/>
+    <component base="dotbelowcomb" xOffset="332"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/micro.glif b/src/Cantarell-Light.ufo/glyphs/micro.glif
index d2fccfef..c69c0782 100644
--- a/src/Cantarell-Light.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/micro.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="551"/>
+  <advance width="565"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="100" y="-217" type="line"/>
-      <point x="120" y="-217" type="line"/>
-      <point x="120" y="482" type="line"/>
-      <point x="100" y="482" type="line"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="127" y="-217" type="line"/>
+      <point x="127" y="482" type="line"/>
+      <point x="107" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="259" y="-6" type="curve" smooth="yes"/>
-      <point x="335" y="-6"/>
-      <point x="402" y="31"/>
-      <point x="446" y="96" type="curve"/>
-      <point x="439" y="107" type="line"/>
-      <point x="396" y="46"/>
-      <point x="333" y="12"/>
-      <point x="264" y="12" type="curve" smooth="yes"/>
-      <point x="173" y="12"/>
-      <point x="120" y="69"/>
-      <point x="120" y="166" type="curve"/>
-      <point x="100" y="184" type="line"/>
-      <point x="100" y="55"/>
-      <point x="163" y="-6"/>
+      <point x="266" y="-6" type="curve" smooth="yes"/>
+      <point x="342" y="-6"/>
+      <point x="409" y="31"/>
+      <point x="453" y="96" type="curve"/>
+      <point x="446" y="107" type="line"/>
+      <point x="403" y="46"/>
+      <point x="340" y="12"/>
+      <point x="271" y="12" type="curve" smooth="yes"/>
+      <point x="180" y="12"/>
+      <point x="127" y="69"/>
+      <point x="127" y="166" type="curve"/>
+      <point x="107" y="184" type="line"/>
+      <point x="107" y="55"/>
+      <point x="170" y="-6"/>
     </contour>
     <contour>
-      <point x="434" y="0" type="line"/>
-      <point x="451" y="0" type="line"/>
-      <point x="451" y="480" type="line"/>
-      <point x="430" y="480" type="line"/>
-      <point x="430" y="76" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="480" type="line"/>
+      <point x="437" y="480" type="line"/>
+      <point x="437" y="76" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/n.glif b/src/Cantarell-Light.ufo/glyphs/n.glif
index 539693f4..45124048 100644
--- a/src/Cantarell-Light.ufo/glyphs/n.glif
+++ b/src/Cantarell-Light.ufo/glyphs/n.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="n" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="006E"/>
   <note>
 n
 </note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="274" y="480" name="top"/>
+  <anchor x="285" y="0" name="bottom"/>
+  <anchor x="281" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="437" y="0" type="line"/>
-      <point x="458" y="0" type="line"/>
-      <point x="458" y="314" type="line" smooth="yes"/>
-      <point x="458" y="421"/>
-      <point x="398" y="486"/>
-      <point x="292" y="486" type="curve" smooth="yes"/>
-      <point x="216" y="486"/>
-      <point x="146" y="454"/>
-      <point x="105" y="399" type="curve"/>
-      <point x="114" y="388" type="line"/>
-      <point x="148" y="436"/>
-      <point x="218" y="468"/>
-      <point x="289" y="468" type="curve" smooth="yes"/>
-      <point x="384" y="468"/>
-      <point x="437" y="411"/>
-      <point x="437" y="314" type="curve" smooth="yes"/>
+      <point x="444" y="0" type="line"/>
+      <point x="465" y="0" type="line"/>
+      <point x="465" y="314" type="line" smooth="yes"/>
+      <point x="465" y="421"/>
+      <point x="405" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="223" y="486"/>
+      <point x="153" y="454"/>
+      <point x="112" y="399" type="curve"/>
+      <point x="121" y="388" type="line"/>
+      <point x="155" y="436"/>
+      <point x="225" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="391" y="468"/>
+      <point x="444" y="411"/>
+      <point x="444" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="399" type="line"/>
-      <point x="117" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="399" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nacute.glif b/src/Cantarell-Light.ufo/glyphs/nacute.glif
index 4e5bd125..e4cbb142 100644
--- a/src/Cantarell-Light.ufo/glyphs/nacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nacute" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0144"/>
   <outline>
     <component base="n"/>
-    <component base="acutecomb" xOffset="207"/>
+    <component base="acutecomb" xOffset="214"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ncaron.glif b/src/Cantarell-Light.ufo/glyphs/ncaron.glif
index ef34f5fe..452654ec 100644
--- a/src/Cantarell-Light.ufo/glyphs/ncaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ncaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncaron" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0148"/>
   <outline>
     <component base="n"/>
-    <component base="caroncomb" xOffset="91"/>
+    <component base="caroncomb" xOffset="98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
index 81f5f1d1..72c2a08b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ncommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ncommaaccent" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="0146"/>
   <outline>
     <component base="n"/>
-    <component base="commaaccentcomb" xOffset="149"/>
+    <component base="commaaccentcomb" xOffset="156"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif b/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
index de4d63bb..c46d0da1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ndotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotaccent" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="1E45"/>
   <outline>
     <component base="n"/>
-    <component base="dotaccentcomb" xOffset="155"/>
+    <component base="dotaccentcomb" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
index 2f0c5da0..2ae56ad9 100644
--- a/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ndotbelow" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="1E47"/>
   <outline>
     <component base="n"/>
-    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nj.glif b/src/Cantarell-Light.ufo/glyphs/nj.glif
index 2c99911a..3a2a24f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/nj.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nj.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nj" format="2">
-  <advance width="771"/>
+  <advance width="798"/>
   <unicode hex="01CC"/>
   <outline>
     <component base="n"/>
-    <component base="j" xOffset="550"/>
+    <component base="j" xOffset="563"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
index 7923b07c..e995bb8f 100644
--- a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="817"/>
+  <advance width="824"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
-      <point x="444" y="0" type="line"/>
-      <point x="596" y="0" type="line" smooth="yes"/>
-      <point x="707" y="0"/>
-      <point x="774" y="56"/>
-      <point x="774" y="150" type="curve" smooth="yes"/>
-      <point x="774" y="241"/>
-      <point x="713" y="301"/>
-      <point x="622" y="301" type="curve" smooth="yes"/>
-      <point x="447" y="301" type="line"/>
-      <point x="447" y="284" type="line"/>
-      <point x="615" y="284" type="line" smooth="yes"/>
-      <point x="696" y="284"/>
-      <point x="752" y="228"/>
-      <point x="752" y="145" type="curve" smooth="yes"/>
-      <point x="752" y="65"/>
-      <point x="697" y="17"/>
-      <point x="605" y="17" type="curve" smooth="yes"/>
-      <point x="444" y="17" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="603" y="0" type="line" smooth="yes"/>
+      <point x="714" y="0"/>
+      <point x="781" y="56"/>
+      <point x="781" y="150" type="curve" smooth="yes"/>
+      <point x="781" y="241"/>
+      <point x="720" y="301"/>
+      <point x="629" y="301" type="curve" smooth="yes"/>
+      <point x="454" y="301" type="line"/>
+      <point x="454" y="284" type="line"/>
+      <point x="622" y="284" type="line" smooth="yes"/>
+      <point x="703" y="284"/>
+      <point x="759" y="228"/>
+      <point x="759" y="145" type="curve" smooth="yes"/>
+      <point x="759" y="65"/>
+      <point x="704" y="17"/>
+      <point x="612" y="17" type="curve" smooth="yes"/>
+      <point x="451" y="17" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="112" y="245" type="line"/>
-      <point x="440" y="245" type="line"/>
-      <point x="440" y="262" type="line"/>
-      <point x="112" y="262" type="line"/>
+      <point x="119" y="245" type="line"/>
+      <point x="447" y="245" type="line"/>
+      <point x="447" y="262" type="line"/>
+      <point x="119" y="262" type="line"/>
     </contour>
     <contour>
-      <point x="432" y="0" type="line"/>
-      <point x="453" y="0" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="432" y="480" type="line"/>
+      <point x="439" y="0" type="line"/>
+      <point x="460" y="0" type="line"/>
+      <point x="460" y="480" type="line"/>
+      <point x="439" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
index ac82a76c..cc54a474 100644
--- a/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nlinebelow" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="1E49"/>
   <outline>
     <component base="n"/>
-    <component base="macronbelowcomb" xOffset="28"/>
+    <component base="macronbelowcomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ntilde.glif b/src/Cantarell-Light.ufo/glyphs/ntilde.glif
index fbc15871..81e8eb83 100644
--- a/src/Cantarell-Light.ufo/glyphs/ntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ntilde" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="00F1"/>
   <outline>
     <component base="n"/>
-    <component base="tildecomb" xOffset="39"/>
+    <component base="tildecomb" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/numero.glif b/src/Cantarell-Light.ufo/glyphs/numero.glif
index 3da337c0..0c458216 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="1132"/>
+  <advance width="1164"/>
   <unicode hex="2116"/>
   <outline>
     <component base="N"/>
-    <component base="ordmasculine" xOffset="720"/>
+    <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 866affb3..6cdc429f 100644
--- a/src/Cantarell-Light.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o-cy" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="043E"/>
   <anchor x="268" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/o.glif b/src/Cantarell-Light.ufo/glyphs/o.glif
index 1df8ee40..1e3bd2e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/o.glif
+++ b/src/Cantarell-Light.ufo/glyphs/o.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="006F"/>
   <note>
 o
 </note>
-  <anchor x="276" y="0" name="bottom"/>
-  <anchor x="276" y="240" name="center"/>
-  <anchor x="360" y="10" name="ogonek"/>
-  <anchor x="266" y="480" name="top"/>
-  <anchor x="501" y="480" name="topright"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="240" name="center"/>
+  <anchor x="364" y="10" name="ogonek"/>
+  <anchor x="270" y="480" name="top"/>
+  <anchor x="505" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="400" y="-10"/>
-      <point x="485" y="90"/>
-      <point x="485" y="240" type="curve" smooth="yes"/>
-      <point x="485" y="389"/>
-      <point x="401" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="489" y="90"/>
+      <point x="489" y="240" type="curve" smooth="yes"/>
+      <point x="489" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="388" y="468"/>
-      <point x="464" y="378"/>
-      <point x="464" y="237" type="curve" smooth="yes"/>
-      <point x="464" y="97"/>
-      <point x="389" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oacute.glif b/src/Cantarell-Light.ufo/glyphs/oacute.glif
index 7f004caf..8c625784 100644
--- a/src/Cantarell-Light.ufo/glyphs/oacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oacute" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acutecomb" xOffset="199"/>
+    <component base="acutecomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif b/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
index 09c60c16..13135520 100644
--- a/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/obarred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obarred-cy" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="04E9"/>
   <outline>
     <component base="o"/>
-    <component base="strokeshortcomb" xScale="1.71042" xOffset="-136" yOffset="-59"/>
+    <component base="strokeshortcomb" xScale="1.71042" xOffset="-132" yOffset="-59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/obreve.glif b/src/Cantarell-Light.ufo/glyphs/obreve.glif
index 83944f5c..3e5a4bda 100644
--- a/src/Cantarell-Light.ufo/glyphs/obreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/obreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obreve" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="brevecomb" xOffset="80"/>
+    <component base="brevecomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocaron.glif b/src/Cantarell-Light.ufo/glyphs/ocaron.glif
index 7f29f393..ff995219 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocaron" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caroncomb" xOffset="83"/>
+    <component base="caroncomb" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
index 7f706ff2..1f7a2284 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflex" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb" xOffset="95"/>
+    <component base="circumflexcomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
index 403ff561..458f2122 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexacute" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb.loclVIET" xOffset="90"/>
-    <component base="acutecomb.loclVIET" xOffset="309" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="acutecomb.loclVIET" xOffset="313" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
index 73c68d8d..14e6c91a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexdotbelow" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="156"/>
-    <component base="circumflexcomb" xOffset="95"/>
+    <component base="dotbelowcomb" xOffset="160"/>
+    <component base="circumflexcomb" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
index a68f8932..4f3567b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexgrave" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb.loclVIET" xOffset="90"/>
-    <component base="gravecomb.loclVIET" xOffset="205" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="gravecomb.loclVIET" xOffset="209" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
index 9ef1b8f7..fe66c21f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexhookabove" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb.loclVIET" xOffset="90"/>
-    <component base="hookabovecomb.loclVIET" xOffset="236" yOffset="74"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="hookabovecomb.loclVIET" xOffset="240" yOffset="74"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
index 946624bd..ce26aba0 100644
--- a/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ocircumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflextilde" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb.loclVIET" xOffset="90"/>
-    <component base="tildecomb.loclVIET" xOffset="39" yOffset="80"/>
+    <component base="circumflexcomb.loclVIET" xOffset="94"/>
+    <component base="tildecomb.loclVIET" xOffset="43" yOffset="80"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/odblgrave.glif b/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
index 0b483d63..1c25306c 100644
--- a/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odblgrave" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecomb" xOffset="14"/>
+    <component base="dblgravecomb" xOffset="18"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
index ed5bf22a..58a291e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis-cy" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresis.glif b/src/Cantarell-Light.ufo/glyphs/odieresis.glif
index 7a15cda8..e3295cdb 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb" xOffset="47"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
index 0bb70af5..41f822c7 100644
--- a/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresismacron" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb.loclVIET" xOffset="47"/>
-    <component base="macroncomb" xOffset="23" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="51"/>
+    <component base="macroncomb" xOffset="27" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
index 2220e208..ca605c02 100644
--- a/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotaccentmacron" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="147"/>
-    <component base="macroncomb" xOffset="23" yOffset="79"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="151"/>
+    <component base="macroncomb" xOffset="27" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/odotbelow.glif b/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
index 707bed06..cfe3a3e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/odotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotbelow" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ECD"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="156"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oe.glif b/src/Cantarell-Light.ufo/glyphs/oe.glif
index bb4e22e4..59e3e870 100644
--- a/src/Cantarell-Light.ufo/glyphs/oe.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oe.glif
@@ -1,70 +1,70 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oe" format="2">
-  <advance width="918"/>
+  <advance width="921"/>
   <unicode hex="0153"/>
-  <anchor x="456" y="0" name="bottom"/>
-  <anchor x="456" y="480" name="top"/>
+  <anchor x="460" y="0" name="bottom"/>
+  <anchor x="460" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="400" y="-10"/>
-      <point x="479" y="90"/>
-      <point x="479" y="240" type="curve" smooth="yes"/>
-      <point x="479" y="389"/>
-      <point x="401" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="483" y="90"/>
+      <point x="483" y="240" type="curve" smooth="yes"/>
+      <point x="483" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="388" y="468"/>
-      <point x="464" y="378"/>
-      <point x="464" y="237" type="curve" smooth="yes"/>
-      <point x="464" y="97"/>
-      <point x="389" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
     <contour>
-      <point x="690" y="-10" type="curve" smooth="yes"/>
-      <point x="742" y="-10"/>
-      <point x="791" y="3"/>
-      <point x="831" y="30" type="curve"/>
-      <point x="826" y="44" type="line"/>
-      <point x="783" y="19"/>
-      <point x="738" y="6"/>
-      <point x="692" y="6" type="curve" smooth="yes"/>
-      <point x="565" y="6"/>
-      <point x="487" y="95"/>
-      <point x="487" y="241" type="curve" smooth="yes"/>
-      <point x="487" y="382"/>
-      <point x="554" y="468"/>
-      <point x="664" y="468" type="curve" smooth="yes"/>
-      <point x="768" y="468"/>
-      <point x="833" y="388"/>
-      <point x="833" y="261" type="curve"/>
-      <point x="475" y="261" type="line"/>
-      <point x="475" y="244" type="line"/>
-      <point x="853" y="244" type="line"/>
-      <point x="854" y="251"/>
-      <point x="854" y="256"/>
-      <point x="854" y="264" type="curve" smooth="yes"/>
-      <point x="854" y="396"/>
-      <point x="778" y="486"/>
-      <point x="666" y="486" type="curve" smooth="yes"/>
-      <point x="545" y="486"/>
-      <point x="468" y="387"/>
-      <point x="468" y="239" type="curve" smooth="yes"/>
-      <point x="468" y="87"/>
-      <point x="553" y="-10"/>
+      <point x="694" y="-10" type="curve" smooth="yes"/>
+      <point x="746" y="-10"/>
+      <point x="795" y="3"/>
+      <point x="835" y="30" type="curve"/>
+      <point x="830" y="44" type="line"/>
+      <point x="787" y="19"/>
+      <point x="742" y="6"/>
+      <point x="696" y="6" type="curve" smooth="yes"/>
+      <point x="569" y="6"/>
+      <point x="491" y="95"/>
+      <point x="491" y="241" type="curve" smooth="yes"/>
+      <point x="491" y="382"/>
+      <point x="558" y="468"/>
+      <point x="668" y="468" type="curve" smooth="yes"/>
+      <point x="772" y="468"/>
+      <point x="837" y="388"/>
+      <point x="837" y="261" type="curve"/>
+      <point x="479" y="261" type="line"/>
+      <point x="479" y="244" type="line"/>
+      <point x="857" y="244" type="line"/>
+      <point x="858" y="251"/>
+      <point x="858" y="256"/>
+      <point x="858" y="264" type="curve" smooth="yes"/>
+      <point x="858" y="396"/>
+      <point x="782" y="486"/>
+      <point x="670" y="486" type="curve" smooth="yes"/>
+      <point x="549" y="486"/>
+      <point x="472" y="387"/>
+      <point x="472" y="239" type="curve" smooth="yes"/>
+      <point x="472" y="87"/>
+      <point x="557" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ograve.glif b/src/Cantarell-Light.ufo/glyphs/ograve.glif
index 4725dc6a..dc618d6d 100644
--- a/src/Cantarell-Light.ufo/glyphs/ograve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ograve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ograve" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="gravecomb" xOffset="82"/>
+    <component base="gravecomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohookabove.glif b/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
index 80e840ce..46f403a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohookabove" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hookabovecomb" xOffset="114"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorn.glif b/src/Cantarell-Light.ufo/glyphs/ohorn.glif
index acbc6d05..dbf4b19a 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorn" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="01A1"/>
   <outline>
     <component base="o"/>
-    <component base="horncomb" xOffset="369" yOffset="-2"/>
+    <component base="horncomb" xOffset="373" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohornacute.glif b/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
index 72e1ad05..e1e39d16 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornacute" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acutecomb" xOffset="199"/>
+    <component base="acutecomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
index 413335d5..980050b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorndotbelow" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="1EE3"/>
   <outline>
     <component base="ohorn"/>
-    <component base="dotbelowcomb" xOffset="156"/>
+    <component base="dotbelowcomb" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif b/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
index 021bf588..17e49f09 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorngrave" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="gravecomb" xOffset="82"/>
+    <component base="gravecomb" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
index f15d894e..b1826461 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornhookabove" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hookabovecomb" xOffset="114"/>
+    <component base="hookabovecomb" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif b/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
index e2032aa8..8d5a3450 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorntilde" format="2">
-  <advance width="601"/>
+  <advance width="609"/>
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tildecomb" xOffset="31"/>
+    <component base="tildecomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
index e2b2bfd5..5a7b87a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ohungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohungarumlaut" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlautcomb" xOffset="125"/>
+    <component base="hungarumlautcomb" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
index 155c25a8..0a393c19 100644
--- a/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oinvertedbreve" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvertedcomb" xOffset="65"/>
+    <component base="breveinvertedcomb" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacron.glif b/src/Cantarell-Light.ufo/glyphs/omacron.glif
index 67cd8a2b..e4097f1e 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacron" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb" xOffset="23"/>
+    <component base="macroncomb" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
index 296b2a10..6e86b509 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacronacute" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb.loclVIET" xOffset="28"/>
-    <component base="acutecomb" xOffset="199" yOffset="69"/>
+    <component base="macroncomb.loclVIET" xOffset="32"/>
+    <component base="acutecomb" xOffset="203" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
index a0acd303..0083ba2a 100644
--- a/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omacrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacrongrave" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb.loclVIET" xOffset="28"/>
-    <component base="gravecomb" xOffset="82" yOffset="69"/>
+    <component base="macroncomb.loclVIET" xOffset="32"/>
+    <component base="gravecomb" xOffset="86" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oogonek.glif b/src/Cantarell-Light.ufo/glyphs/oogonek.glif
index 6845570b..88d4391e 100644
--- a/src/Cantarell-Light.ufo/glyphs/oogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oogonek" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="01EB"/>
   <outline>
     <component base="o"/>
-    <component base="ogonekcomb.tall" xOffset="-41" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-37" yOffset="-1"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oslash.glif b/src/Cantarell-Light.ufo/glyphs/oslash.glif
index cc0917cf..8d9f10b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oslash.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslash" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F8"/>
-  <anchor x="275" y="480" name="top"/>
+  <anchor x="279" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="-42" type="line"/>
-      <point x="463" y="505" type="line"/>
-      <point x="452" y="513" type="line"/>
-      <point x="85" y="-34" type="line"/>
+      <point x="100" y="-42" type="line"/>
+      <point x="467" y="505" type="line"/>
+      <point x="456" y="513" type="line"/>
+      <point x="89" y="-34" type="line"/>
     </contour>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="400" y="-10"/>
-      <point x="485" y="90"/>
-      <point x="485" y="240" type="curve" smooth="yes"/>
-      <point x="485" y="389"/>
-      <point x="401" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="489" y="90"/>
+      <point x="489" y="240" type="curve" smooth="yes"/>
+      <point x="489" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="388" y="468"/>
-      <point x="464" y="378"/>
-      <point x="464" y="237" type="curve" smooth="yes"/>
-      <point x="464" y="97"/>
-      <point x="389" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/oslashacute.glif b/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
index 264299d4..76dbd309 100644
--- a/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oslashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslashacute" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="01FF"/>
   <outline>
     <component base="oslash"/>
-    <component base="acutecomb" xOffset="208"/>
+    <component base="acutecomb" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otilde.glif b/src/Cantarell-Light.ufo/glyphs/otilde.glif
index e87799ca..8b9280d0 100644
--- a/src/Cantarell-Light.ufo/glyphs/otilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otilde" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="00F5"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="31"/>
+    <component base="tildecomb" xOffset="35"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildeacute.glif b/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
index 3d0b40d4..51c9252e 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildeacute" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="31"/>
-    <component base="acutecomb" xOffset="199" yOffset="132"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="acutecomb" xOffset="203" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
index d1a200b6..568df75b 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildedieresis" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="31"/>
-    <component base="dieresiscomb" xOffset="47" yOffset="132"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="dieresiscomb" xOffset="51" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/otildemacron.glif 
b/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
index 9031ddf6..70a3c202 100644
--- a/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/otildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildemacron" format="2">
-  <advance width="549"/>
+  <advance width="557"/>
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="31"/>
-    <component base="macroncomb" xOffset="23" yOffset="132"/>
+    <component base="tildecomb" xOffset="35"/>
+    <component base="macroncomb" xOffset="27" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/p.glif b/src/Cantarell-Light.ufo/glyphs/p.glif
index 37fef7ad..9a835cc1 100644
--- a/src/Cantarell-Light.ufo/glyphs/p.glif
+++ b/src/Cantarell-Light.ufo/glyphs/p.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="p" format="2">
-  <advance width="554"/>
+  <advance width="565"/>
   <unicode hex="0070"/>
   <note>
 p
 </note>
-  <anchor x="271" y="0" name="bottom"/>
-  <anchor x="271" y="480" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="278" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="280" y="-10" type="curve" smooth="yes"/>
-      <point x="405" y="-10"/>
-      <point x="490" y="90"/>
-      <point x="490" y="240" type="curve" smooth="yes"/>
-      <point x="490" y="389"/>
-      <point x="406" y="486"/>
-      <point x="282" y="486" type="curve" smooth="yes"/>
-      <point x="199" y="486"/>
-      <point x="139" y="444"/>
-      <point x="106" y="375" type="curve"/>
-      <point x="110" y="355" type="line"/>
-      <point x="140" y="425"/>
-      <point x="198" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="393" y="468"/>
-      <point x="469" y="378"/>
-      <point x="469" y="237" type="curve" smooth="yes"/>
-      <point x="469" y="97"/>
-      <point x="394" y="8"/>
-      <point x="282" y="8" type="curve" smooth="yes"/>
-      <point x="202" y="8"/>
-      <point x="141" y="53"/>
-      <point x="111" y="126" type="curve"/>
-      <point x="108" y="96" type="line"/>
-      <point x="141" y="29"/>
-      <point x="200" y="-10"/>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="412" y="-10"/>
+      <point x="497" y="90"/>
+      <point x="497" y="240" type="curve" smooth="yes"/>
+      <point x="497" y="389"/>
+      <point x="413" y="486"/>
+      <point x="289" y="486" type="curve" smooth="yes"/>
+      <point x="206" y="486"/>
+      <point x="146" y="444"/>
+      <point x="113" y="375" type="curve"/>
+      <point x="117" y="355" type="line"/>
+      <point x="147" y="425"/>
+      <point x="205" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="400" y="468"/>
+      <point x="476" y="378"/>
+      <point x="476" y="237" type="curve" smooth="yes"/>
+      <point x="476" y="97"/>
+      <point x="401" y="8"/>
+      <point x="289" y="8" type="curve" smooth="yes"/>
+      <point x="209" y="8"/>
+      <point x="148" y="53"/>
+      <point x="118" y="126" type="curve"/>
+      <point x="115" y="96" type="line"/>
+      <point x="148" y="29"/>
+      <point x="207" y="-10"/>
     </contour>
     <contour>
-      <point x="100" y="-217" type="line"/>
-      <point x="120" y="-217" type="line"/>
-      <point x="120" y="406" type="line"/>
-      <point x="115" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="127" y="-217" type="line"/>
+      <point x="127" y="406" type="line"/>
+      <point x="122" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
index d340af0a..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="229"/>
+  <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 d480eaf1..269d97e7 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="598"/>
+  <advance width="621"/>
   <unicode hex="00B6"/>
   <outline>
     <contour>
-      <point x="269" y="-162" type="line"/>
-      <point x="288" y="-162" type="line"/>
-      <point x="288" y="677" type="line"/>
-      <point x="475" y="677" type="line"/>
-      <point x="475" y="-162" type="line"/>
-      <point x="494" y="-162" type="line"/>
-      <point x="494" y="694" type="line"/>
-      <point x="269" y="694" type="line" smooth="yes"/>
-      <point x="138" y="694"/>
-      <point x="50" y="615"/>
-      <point x="50" y="497" type="curve" smooth="yes"/>
-      <point x="50" y="375"/>
-      <point x="138" y="293"/>
-      <point x="269" y="293" type="curve"/>
+      <point x="276" y="-162" type="line"/>
+      <point x="295" y="-162" type="line"/>
+      <point x="295" y="677" type="line"/>
+      <point x="482" y="677" type="line"/>
+      <point x="482" y="-162" type="line"/>
+      <point x="501" y="-162" type="line"/>
+      <point x="501" y="694" type="line"/>
+      <point x="276" y="694" type="line" smooth="yes"/>
+      <point x="145" y="694"/>
+      <point x="57" y="615"/>
+      <point x="57" y="497" type="curve" smooth="yes"/>
+      <point x="57" y="375"/>
+      <point x="145" y="293"/>
+      <point x="276" y="293" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif b/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
index 447d75e2..41d80ace 100644
--- a/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/pe-cy.glif
@@ -1,18 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pe-cy" format="2">
-  <advance width="554"/>
+  <advance width="568"/>
   <unicode hex="043F"/>
-  <anchor x="521" y="0" name="bottomright"/>
+  <anchor x="528" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="120" y="0" type="line"/>
-      <point x="120" y="463" type="line"/>
-      <point x="434" y="463" type="line"/>
-      <point x="434" y="0" type="line"/>
-      <point x="454" y="0" type="line"/>
-      <point x="454" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="127" y="0" type="line"/>
+      <point x="127" y="463" type="line"/>
+      <point x="441" y="463" type="line"/>
+      <point x="441" y="0" type="line"/>
+      <point x="461" y="0" type="line"/>
+      <point x="461" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/product.glif b/src/Cantarell-Light.ufo/glyphs/product.glif
index 96f2f5e7..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="682"/>
+  <advance width="714"/>
   <unicode hex="220F"/>
   <outline>
     <contour>
-      <point x="104" y="-95" type="line"/>
-      <point x="124" y="-95" type="line"/>
-      <point x="124" y="676" type="line"/>
-      <point x="558" y="676" type="line"/>
-      <point x="558" y="-95" type="line"/>
-      <point x="578" y="-95" type="line"/>
-      <point x="578" y="694" type="line"/>
-      <point x="104" 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/q.glif b/src/Cantarell-Light.ufo/glyphs/q.glif
index a3d6bf89..2a16c78d 100644
--- a/src/Cantarell-Light.ufo/glyphs/q.glif
+++ b/src/Cantarell-Light.ufo/glyphs/q.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="q" format="2">
-  <advance width="555"/>
+  <advance width="566"/>
   <unicode hex="0071"/>
   <note>
 q
 </note>
-  <anchor x="285" y="0" name="bottom"/>
-  <anchor x="285" y="480" name="top"/>
+  <anchor x="289" y="0" name="bottom"/>
+  <anchor x="289" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="275" y="-10" type="curve" smooth="yes"/>
-      <point x="346" y="-10"/>
-      <point x="403" y="23"/>
-      <point x="439" y="85" type="curve"/>
-      <point x="436" y="106" type="line"/>
-      <point x="404" y="44"/>
-      <point x="348" y="8"/>
-      <point x="277" y="8" type="curve" smooth="yes"/>
-      <point x="160" y="8"/>
-      <point x="85" y="101"/>
-      <point x="85" y="239" type="curve" smooth="yes"/>
-      <point x="85" y="374"/>
-      <point x="157" y="468"/>
-      <point x="272" y="468" type="curve" smooth="yes"/>
-      <point x="346" y="468"/>
-      <point x="404" y="431"/>
-      <point x="436" y="367" type="curve"/>
-      <point x="440" y="396" type="line"/>
-      <point x="406" y="454"/>
-      <point x="350" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="149" y="486"/>
-      <point x="64" y="386"/>
-      <point x="64" y="237" type="curve" smooth="yes"/>
-      <point x="64" y="89"/>
-      <point x="148" y="-10"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="350" y="-10"/>
+      <point x="407" y="23"/>
+      <point x="443" y="85" type="curve"/>
+      <point x="440" y="106" type="line"/>
+      <point x="408" y="44"/>
+      <point x="352" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="164" y="8"/>
+      <point x="89" y="101"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="374"/>
+      <point x="161" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="350" y="468"/>
+      <point x="408" y="431"/>
+      <point x="440" y="367" type="curve"/>
+      <point x="444" y="396" type="line"/>
+      <point x="410" y="454"/>
+      <point x="354" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="153" y="486"/>
+      <point x="68" y="386"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="89"/>
+      <point x="152" y="-10"/>
     </contour>
     <contour>
-      <point x="435" y="-217" type="line"/>
-      <point x="455" y="-217" type="line"/>
-      <point x="455" y="480" type="line"/>
-      <point x="440" y="480" type="line"/>
-      <point x="435" y="406" type="line"/>
+      <point x="439" y="-217" type="line"/>
+      <point x="459" y="-217" type="line"/>
+      <point x="459" y="480" type="line"/>
+      <point x="444" y="480" type="line"/>
+      <point x="439" y="406" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/qa-cy.glif b/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
index 3664a27d..09a8a1c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/qa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="qa-cy" format="2">
-  <advance width="555"/>
+  <advance width="566"/>
   <unicode hex="051B"/>
   <outline>
     <component base="q"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/r.glif b/src/Cantarell-Light.ufo/glyphs/r.glif
index 5910d95e..68232033 100644
--- a/src/Cantarell-Light.ufo/glyphs/r.glif
+++ b/src/Cantarell-Light.ufo/glyphs/r.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="r" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0072"/>
   <note>
 r
 </note>
-  <anchor x="109" y="0" name="bottom"/>
-  <anchor x="201" y="480" name="top"/>
+  <anchor x="116" y="0" name="bottom"/>
+  <anchor x="208" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="121" y="0" type="line"/>
-      <point x="121" y="378" type="line"/>
-      <point x="117" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="378" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="113" y="365" type="line"/>
-      <point x="146" y="426"/>
-      <point x="202" y="462"/>
-      <point x="262" y="462" type="curve" smooth="yes"/>
-      <point x="279" y="462"/>
-      <point x="298" y="459"/>
-      <point x="314" y="453" type="curve"/>
-      <point x="320" y="469" type="line"/>
-      <point x="305" y="476"/>
-      <point x="285" y="480"/>
-      <point x="264" y="480" type="curve" smooth="yes"/>
-      <point x="199" y="480"/>
-      <point x="143" y="446"/>
-      <point x="113" y="388" type="curve"/>
+      <point x="120" y="365" type="line"/>
+      <point x="153" y="426"/>
+      <point x="209" y="462"/>
+      <point x="269" y="462" type="curve" smooth="yes"/>
+      <point x="286" y="462"/>
+      <point x="305" y="459"/>
+      <point x="321" y="453" type="curve"/>
+      <point x="327" y="469" type="line"/>
+      <point x="312" y="476"/>
+      <point x="292" y="480"/>
+      <point x="271" y="480" type="curve" smooth="yes"/>
+      <point x="206" y="480"/>
+      <point x="150" y="446"/>
+      <point x="120" y="388" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/racute.glif b/src/Cantarell-Light.ufo/glyphs/racute.glif
index dc387d8a..641c47ae 100644
--- a/src/Cantarell-Light.ufo/glyphs/racute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/racute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="racute" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0155"/>
   <outline>
     <component base="r"/>
-    <component base="acutecomb" xOffset="134"/>
+    <component base="acutecomb" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rcaron.glif b/src/Cantarell-Light.ufo/glyphs/rcaron.glif
index 6007222e..c0e07a5d 100644
--- a/src/Cantarell-Light.ufo/glyphs/rcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcaron" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0159"/>
   <outline>
     <component base="r"/>
-    <component base="caroncomb" xOffset="18"/>
+    <component base="caroncomb" xOffset="25"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
index 80c13261..91dbf731 100644
--- a/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rcommaaccent" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0157"/>
   <outline>
     <component base="r"/>
-    <component base="commaaccentcomb" xOffset="-20"/>
+    <component base="commaaccentcomb" xOffset="-13"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif b/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
index 69f4c231..e2dcab7e 100644
--- a/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rdblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdblgrave" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0211"/>
   <outline>
     <component base="r"/>
-    <component base="dblgravecomb" xOffset="-51"/>
+    <component base="dblgravecomb" xOffset="-44"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
index b5bdf336..d67ac648 100644
--- a/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rdotbelow" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="1E5B"/>
   <outline>
     <component base="r"/>
-    <component base="dotbelowcomb" xOffset="-11"/>
+    <component base="dotbelowcomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
index 695e093b..b26aeb3a 100644
--- a/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rinvertedbreve" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="0213"/>
   <outline>
     <component base="r"/>
-    <component base="breveinvertedcomb"/>
+    <component base="breveinvertedcomb" xOffset="7"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
index 72c4e3ae..d82de550 100644
--- a/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rlinebelow" format="2">
-  <advance width="346"/>
+  <advance width="349"/>
   <unicode hex="1E5F"/>
   <outline>
     <component base="r"/>
-    <component base="macronbelowcomb.narrow" xOffset="-112"/>
+    <component base="macronbelowcomb.narrow" xOffset="-105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/s.glif b/src/Cantarell-Light.ufo/glyphs/s.glif
index f53fee9c..d4abff08 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="447"/>
+  <advance width="455"/>
   <unicode hex="0073"/>
   <note>
 s
 </note>
-  <anchor x="216" y="0" name="bottom"/>
-  <anchor x="225" y="480" name="top"/>
+  <anchor x="220" y="0" name="bottom"/>
+  <anchor x="229" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="231" y="-10" type="curve" smooth="yes"/>
-      <point x="334" y="-10"/>
-      <point x="394" y="40"/>
-      <point x="394" y="118" type="curve" smooth="yes"/>
-      <point x="394" y="294"/>
-      <point x="86" y="208"/>
-      <point x="86" y="362" type="curve" smooth="yes"/>
-      <point x="86" y="429"/>
-      <point x="145" y="468"/>
-      <point x="233" y="468" type="curve" smooth="yes"/>
-      <point x="280" y="468"/>
-      <point x="330" y="457"/>
-      <point x="362" y="440" type="curve"/>
-      <point x="369" y="456" type="line"/>
-      <point x="338" y="474"/>
-      <point x="282" y="486"/>
-      <point x="233" y="486" type="curve" smooth="yes"/>
-      <point x="133" y="486"/>
-      <point x="65" y="437"/>
-      <point x="65" y="358" type="curve" smooth="yes"/>
-      <point x="65" y="189"/>
-      <point x="373" y="276"/>
-      <point x="373" y="115" type="curve" smooth="yes"/>
-      <point x="373" y="49"/>
-      <point x="322" y="8"/>
-      <point x="233" y="8" type="curve" smooth="yes"/>
-      <point x="179" y="8"/>
-      <point x="117" y="23"/>
-      <point x="61" y="50" type="curve"/>
-      <point x="54" y="33" type="line"/>
-      <point x="111" y="5"/>
-      <point x="175" y="-10"/>
+      <point x="235" y="-10" type="curve" smooth="yes"/>
+      <point x="338" y="-10"/>
+      <point x="398" y="40"/>
+      <point x="398" y="118" type="curve" smooth="yes"/>
+      <point x="398" y="294"/>
+      <point x="90" y="208"/>
+      <point x="90" y="362" type="curve" smooth="yes"/>
+      <point x="90" y="429"/>
+      <point x="149" y="468"/>
+      <point x="237" y="468" type="curve" smooth="yes"/>
+      <point x="284" y="468"/>
+      <point x="334" y="457"/>
+      <point x="366" y="440" type="curve"/>
+      <point x="373" y="456" type="line"/>
+      <point x="342" y="474"/>
+      <point x="286" y="486"/>
+      <point x="237" y="486" type="curve" smooth="yes"/>
+      <point x="137" y="486"/>
+      <point x="69" y="437"/>
+      <point x="69" y="358" type="curve" smooth="yes"/>
+      <point x="69" y="189"/>
+      <point x="377" y="276"/>
+      <point x="377" y="115" type="curve" smooth="yes"/>
+      <point x="377" y="49"/>
+      <point x="326" y="8"/>
+      <point x="237" y="8" type="curve" smooth="yes"/>
+      <point x="183" y="8"/>
+      <point x="121" y="23"/>
+      <point x="65" y="50" type="curve"/>
+      <point x="58" y="33" type="line"/>
+      <point x="115" y="5"/>
+      <point x="179" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacute.glif b/src/Cantarell-Light.ufo/glyphs/sacute.glif
index 4b3c816e..d391e394 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacute" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="015B"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb" xOffset="158"/>
+    <component base="acutecomb" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
index a1b21254..46919651 100644
--- a/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sacutedotaccent.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sacutedotaccent" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="1E65"/>
   <outline>
     <component base="s"/>
-    <component base="acutecomb.loclVIET" xOffset="160"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="72" yOffset="97"/>
+    <component base="acutecomb.loclVIET" xOffset="164"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="76" yOffset="97"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/saltillo.glif b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
index da07a3a6..832c8cde 100644
--- a/src/Cantarell-Light.ufo/glyphs/saltillo.glif
+++ b/src/Cantarell-Light.ufo/glyphs/saltillo.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="saltillo" format="2">
-  <advance width="224"/>
+  <advance width="238"/>
   <unicode hex="A78C"/>
   <outline>
-    <component base="quotesingle" yScale="1.40024" xOffset="14" yOffset="-278"/>
+    <component base="quotesingle" yScale="1.40024" xOffset="21" yOffset="-278"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/scaron.glif b/src/Cantarell-Light.ufo/glyphs/scaron.glif
index a40bba57..02a71ebb 100644
--- a/src/Cantarell-Light.ufo/glyphs/scaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scaron" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="0161"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb" xOffset="42"/>
+    <component base="caroncomb" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
index df7e43dd..8a0f0d53 100644
--- a/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scarondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scarondotaccent" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="1E67"/>
   <outline>
     <component base="s"/>
-    <component base="caroncomb.loclVIET" xOffset="40"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="106" yOffset="99"/>
+    <component base="caroncomb.loclVIET" xOffset="44"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="110" yOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scedilla.glif b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
index 2baa1f81..a917bf82 100644
--- a/src/Cantarell-Light.ufo/glyphs/scedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scedilla" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="015F"/>
   <outline>
     <component base="s"/>
-    <component base="cedillacomb" xOffset="91"/>
+    <component base="cedillacomb" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
index f4d6ef83..a211816a 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa-cy" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="04D9"/>
   <outline>
     <component base="schwa"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/schwa.glif b/src/Cantarell-Light.ufo/glyphs/schwa.glif
index 2c97794b..77e058ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/schwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/schwa.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="schwa" format="2">
-  <advance width="517"/>
+  <advance width="520"/>
   <unicode hex="0259"/>
   <outline>
-    <component base="e" xScale="-1" yScale="-1" xOffset="517" yOffset="480"/>
+    <component base="e" xScale="-1" yScale="-1" xOffset="520" yOffset="480"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
index ea21396a..4f6b9650 100644
--- a/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scircumflex" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="015D"/>
   <outline>
     <component base="s"/>
-    <component base="circumflexcomb" xOffset="54"/>
+    <component base="circumflexcomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
index f366bffc..ade75d7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/scommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="scommaaccent" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="0219"/>
   <outline>
     <component base="s"/>
-    <component base="commaaccentcomb" xOffset="87"/>
+    <component base="commaaccentcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
index 5fb6b143..f9f1aaf3 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotaccent" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="1E61"/>
   <outline>
     <component base="s"/>
-    <component base="dotaccentcomb" xOffset="106"/>
+    <component base="dotaccentcomb" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
index b833c42e..3004ba18 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelow" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="1E63"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xOffset="96"/>
+    <component base="dotbelowcomb" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
index f0282265..183b2434 100644
--- a/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sdotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sdotbelowdotaccent" format="2">
-  <advance width="447"/>
+  <advance width="455"/>
   <unicode hex="1E69"/>
   <outline>
     <component base="s"/>
-    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="101"/>
-    <component base="dotaccentcomb" xOffset="106"/>
+    <component base="dotbelowcomb" xScale="0.96154" yScale="0.96154" xOffset="105"/>
+    <component base="dotaccentcomb" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
index 3e5a9971..3b8c748a 100644
--- a/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sha-cy.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sha-cy" format="2">
-  <advance width="762"/>
+  <advance width="776"/>
   <unicode hex="0448"/>
-  <anchor x="693" y="0" name="bottomright"/>
+  <anchor x="700" y="0" name="bottomright"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="662" y="0" type="line"/>
-      <point x="662" y="480" type="line"/>
-      <point x="641" y="480" type="line"/>
-      <point x="641" y="17" type="line"/>
-      <point x="121" y="17" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="669" y="0" type="line"/>
+      <point x="669" y="480" type="line"/>
+      <point x="648" y="480" type="line"/>
+      <point x="648" y="17" type="line"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="376" y="9" type="line"/>
-      <point x="397" y="9" type="line"/>
-      <point x="397" y="480" type="line"/>
-      <point x="376" y="480" type="line"/>
+      <point x="383" y="9" type="line"/>
+      <point x="404" y="9" type="line"/>
+      <point x="404" y="480" type="line"/>
+      <point x="383" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
index 0f3b709b..9c3dd6ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shcha-cy.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shcha-cy" format="2">
-  <advance width="761"/>
+  <advance width="768"/>
   <unicode hex="0449"/>
   <outline>
     <component base="sha-cy"/>
-    <component base="descender-cy" xOffset="597"/>
+    <component base="descender-cy" xOffset="604"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/shha-cy.glif b/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
index d2e6a82f..7bdc6463 100644
--- a/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/shha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="shha-cy" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="04BB"/>
   <outline>
     <component base="h"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
index dd67540b..cb292cd3 100644
--- a/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/softsign-cy.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="softsign-cy" format="2">
-  <advance width="481"/>
+  <advance width="488"/>
   <unicode hex="044C"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="260" y="0" type="line" smooth="yes"/>
-      <point x="371" y="0"/>
-      <point x="438" y="56"/>
-      <point x="438" y="150" type="curve" smooth="yes"/>
-      <point x="438" y="241"/>
-      <point x="377" y="301"/>
-      <point x="286" y="301" type="curve" smooth="yes"/>
-      <point x="113" y="301" type="line"/>
-      <point x="113" y="284" type="line"/>
-      <point x="279" y="284" type="line" smooth="yes"/>
-      <point x="360" y="284"/>
-      <point x="416" y="228"/>
-      <point x="416" y="145" type="curve" smooth="yes"/>
-      <point x="416" y="65"/>
-      <point x="361" y="17"/>
-      <point x="269" y="17" type="curve" smooth="yes"/>
-      <point x="121" y="17" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="267" y="0" type="line" smooth="yes"/>
+      <point x="378" y="0"/>
+      <point x="445" y="56"/>
+      <point x="445" y="150" type="curve" smooth="yes"/>
+      <point x="445" y="241"/>
+      <point x="384" y="301"/>
+      <point x="293" y="301" type="curve" smooth="yes"/>
+      <point x="120" y="301" type="line"/>
+      <point x="120" y="284" type="line"/>
+      <point x="286" y="284" type="line" smooth="yes"/>
+      <point x="367" y="284"/>
+      <point x="423" y="228"/>
+      <point x="423" y="145" type="curve" smooth="yes"/>
+      <point x="423" y="65"/>
+      <point x="368" y="17"/>
+      <point x="276" y="17" type="curve" smooth="yes"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/space.glif b/src/Cantarell-Light.ufo/glyphs/space.glif
index 295cb49f..fcabe4c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/space.glif
+++ b/src/Cantarell-Light.ufo/glyphs/space.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="space" format="2">
-  <advance width="200"/>
+  <advance width="240"/>
   <unicode hex="0020"/>
   <unicode hex="00A0"/>
   <note>
diff --git a/src/Cantarell-Light.ufo/glyphs/t.glif b/src/Cantarell-Light.ufo/glyphs/t.glif
index ebe980da..ae78c3b2 100644
--- a/src/Cantarell-Light.ufo/glyphs/t.glif
+++ b/src/Cantarell-Light.ufo/glyphs/t.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="t" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="0074"/>
   <note>
 t
 </note>
-  <anchor x="180" y="0" name="bottom"/>
-  <anchor x="156" y="250" name="center"/>
-  <anchor x="114" y="617" name="top"/>
-  <anchor x="230" y="480" name="topright"/>
+  <anchor x="187" y="0" name="bottom"/>
+  <anchor x="163" y="250" name="center"/>
+  <anchor x="121" y="617" name="top"/>
+  <anchor x="237" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="208" y="-3" type="curve" smooth="yes"/>
-      <point x="232" y="-3"/>
-      <point x="256" y="3"/>
-      <point x="279" y="12" type="curve"/>
-      <point x="274" y="26" type="line"/>
-      <point x="253" y="18"/>
-      <point x="232" y="14"/>
-      <point x="214" y="14" type="curve" smooth="yes"/>
-      <point x="160" y="14"/>
-      <point x="124" y="51"/>
-      <point x="124" y="108" type="curve" smooth="yes"/>
-      <point x="124" y="617" type="line"/>
-      <point x="103" y="617" type="line"/>
-      <point x="103" y="103" type="line" smooth="yes"/>
-      <point x="103" y="38"/>
-      <point x="145" y="-3"/>
+      <point x="215" y="-3" type="curve" smooth="yes"/>
+      <point x="239" y="-3"/>
+      <point x="263" y="3"/>
+      <point x="286" y="12" type="curve"/>
+      <point x="281" y="26" type="line"/>
+      <point x="260" y="18"/>
+      <point x="239" y="14"/>
+      <point x="221" y="14" type="curve" smooth="yes"/>
+      <point x="167" y="14"/>
+      <point x="131" y="51"/>
+      <point x="131" y="108" type="curve" smooth="yes"/>
+      <point x="131" y="617" type="line"/>
+      <point x="110" y="617" type="line"/>
+      <point x="110" y="103" type="line" smooth="yes"/>
+      <point x="110" y="38"/>
+      <point x="152" y="-3"/>
     </contour>
     <contour>
-      <point x="40" y="463" type="line"/>
-      <point x="267" y="463" type="line"/>
-      <point x="267" y="480" type="line"/>
-      <point x="40" y="480" type="line"/>
+      <point x="47" y="463" type="line"/>
+      <point x="274" y="463" type="line"/>
+      <point x="274" y="480" type="line"/>
+      <point x="47" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tbar.glif b/src/Cantarell-Light.ufo/glyphs/tbar.glif
index b7c2cf56..ac29b929 100644
--- a/src/Cantarell-Light.ufo/glyphs/tbar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tbar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tbar" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="0167"/>
   <outline>
     <component base="t"/>
-    <component base="strokeshortcomb" xOffset="-85" yOffset="-49"/>
+    <component base="strokeshortcomb" xOffset="-78" yOffset="-49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcaron.glif b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
index e7241083..c74a26f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcaron" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="0165"/>
   <outline>
     <component base="t"/>
-    <component base="caroncomb.alt" xOffset="118"/>
+    <component base="caroncomb.alt" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
index 3d5030cc..631cd185 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcedilla" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="0163"/>
   <outline>
     <component base="t"/>
-    <component base="cedillacomb" xOffset="55"/>
+    <component base="cedillacomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
index f673e537..65dbc462 100644
--- a/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tcommaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tcommaaccent" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="021B"/>
   <outline>
     <component base="t"/>
-    <component base="commaaccentcomb" xOffset="51"/>
+    <component base="commaaccentcomb" xOffset="58"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
index f653f416..a8dbabc4 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdieresis" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="1E97"/>
   <outline>
     <component base="t"/>
-    <component base="dieresiscomb" xOffset="-105" yOffset="137"/>
+    <component base="dieresiscomb" xOffset="-98" yOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
index 4b805669..af005326 100644
--- a/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tdotbelow" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="1E6D"/>
   <outline>
     <component base="t"/>
-    <component base="dotbelowcomb" xOffset="60"/>
+    <component base="dotbelowcomb" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/thorn.glif b/src/Cantarell-Light.ufo/glyphs/thorn.glif
index e357b408..3269ec25 100644
--- a/src/Cantarell-Light.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/thorn.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="thorn" format="2">
-  <advance width="554"/>
+  <advance width="565"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="280" y="-10" type="curve" smooth="yes"/>
-      <point x="405" y="-10"/>
-      <point x="490" y="90"/>
-      <point x="490" y="240" type="curve" smooth="yes"/>
-      <point x="490" y="389"/>
-      <point x="406" y="486"/>
-      <point x="282" y="486" type="curve" smooth="yes"/>
-      <point x="199" y="486"/>
-      <point x="139" y="444"/>
-      <point x="106" y="375" type="curve"/>
-      <point x="110" y="355" type="line"/>
-      <point x="140" y="425"/>
-      <point x="198" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="393" y="468"/>
-      <point x="469" y="378"/>
-      <point x="469" y="237" type="curve" smooth="yes"/>
-      <point x="469" y="97"/>
-      <point x="394" y="8"/>
-      <point x="282" y="8" type="curve" smooth="yes"/>
-      <point x="202" y="8"/>
-      <point x="141" y="53"/>
-      <point x="111" y="126" type="curve"/>
-      <point x="108" y="96" type="line"/>
-      <point x="141" y="29"/>
-      <point x="200" y="-10"/>
+      <point x="287" y="-10" type="curve" smooth="yes"/>
+      <point x="412" y="-10"/>
+      <point x="497" y="90"/>
+      <point x="497" y="240" type="curve" smooth="yes"/>
+      <point x="497" y="389"/>
+      <point x="413" y="486"/>
+      <point x="289" y="486" type="curve" smooth="yes"/>
+      <point x="206" y="486"/>
+      <point x="146" y="444"/>
+      <point x="113" y="375" type="curve"/>
+      <point x="117" y="355" type="line"/>
+      <point x="147" y="425"/>
+      <point x="205" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="400" y="468"/>
+      <point x="476" y="378"/>
+      <point x="476" y="237" type="curve" smooth="yes"/>
+      <point x="476" y="97"/>
+      <point x="401" y="8"/>
+      <point x="289" y="8" type="curve" smooth="yes"/>
+      <point x="209" y="8"/>
+      <point x="148" y="53"/>
+      <point x="118" y="126" type="curve"/>
+      <point x="115" y="96" type="line"/>
+      <point x="148" y="29"/>
+      <point x="207" y="-10"/>
     </contour>
     <contour>
-      <point x="100" y="-217" type="line"/>
-      <point x="119" y="-217" type="line"/>
-      <point x="119" y="739" type="line"/>
-      <point x="100" y="739" type="line"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="126" y="-217" type="line"/>
+      <point x="126" y="739" type="line"/>
+      <point x="107" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
index 321a7558..61b96ff3 100644
--- a/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tlinebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tlinebelow" format="2">
-  <advance width="301"/>
+  <advance width="320"/>
   <unicode hex="1E6F"/>
   <outline>
     <component base="t"/>
-    <component base="macronbelowcomb" xOffset="-70"/>
+    <component base="macronbelowcomb" xOffset="-63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
index 64500b7b..0411d9d2 100644
--- a/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tse-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tse-cy" format="2">
-  <advance width="524"/>
+  <advance width="531"/>
   <unicode hex="0446"/>
   <outline>
     <contour>
-      <point x="468" y="-121" type="line"/>
-      <point x="487" y="-121" type="line"/>
-      <point x="487" y="17" type="line"/>
-      <point x="121" y="17" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
-      <point x="100" y="0" type="line"/>
-      <point x="468" y="0" type="line"/>
+      <point x="475" y="-121" type="line"/>
+      <point x="494" y="-121" type="line"/>
+      <point x="494" y="17" type="line"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="475" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="405" y="9" type="line"/>
-      <point x="425" y="9" type="line"/>
-      <point x="425" y="480" type="line"/>
-      <point x="405" y="480" type="line"/>
+      <point x="412" y="9" type="line"/>
+      <point x="432" y="9" type="line"/>
+      <point x="432" y="480" type="line"/>
+      <point x="412" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
index cf0a13ad..15136b32 100644
--- a/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tshe-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tshe-cy" format="2">
-  <advance width="550"/>
+  <advance width="563"/>
   <unicode hex="045B"/>
   <anchor x="436" y="0" name="bottom"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/u-cy.glif b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
index 68c438c4..cc0b412e 100644
--- a/src/Cantarell-Light.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="0443"/>
   <anchor x="227" y="480" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/u.glif b/src/Cantarell-Light.ufo/glyphs/u.glif
index 30f4a351..156db483 100644
--- a/src/Cantarell-Light.ufo/glyphs/u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0075"/>
   <note>
 u
 </note>
-  <anchor x="261" y="0" name="bottom"/>
-  <anchor x="436" y="10" name="ogonek"/>
-  <anchor x="261" y="480" name="top"/>
-  <anchor x="502" y="480" name="topright"/>
+  <anchor x="267" y="0" name="bottom"/>
+  <anchor x="442" y="10" name="ogonek"/>
+  <anchor x="267" y="480" name="top"/>
+  <anchor x="508" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="253" y="-6" type="curve" smooth="yes"/>
-      <point x="320" y="-6"/>
-      <point x="390" y="25"/>
-      <point x="439" y="76" type="curve"/>
-      <point x="430" y="87" type="line"/>
-      <point x="384" y="40"/>
-      <point x="318" y="12"/>
-      <point x="257" y="12" type="curve" smooth="yes"/>
-      <point x="168" y="12"/>
-      <point x="113" y="69"/>
-      <point x="113" y="166" type="curve" smooth="yes"/>
-      <point x="113" y="480" type="line"/>
-      <point x="92" y="480" type="line"/>
-      <point x="92" y="166" type="line" smooth="yes"/>
-      <point x="92" y="57"/>
-      <point x="155" y="-6"/>
+      <point x="259" y="-6" type="curve" smooth="yes"/>
+      <point x="326" y="-6"/>
+      <point x="396" y="25"/>
+      <point x="445" y="76" type="curve"/>
+      <point x="436" y="87" type="line"/>
+      <point x="390" y="40"/>
+      <point x="324" y="12"/>
+      <point x="263" y="12" type="curve" smooth="yes"/>
+      <point x="174" y="12"/>
+      <point x="119" y="69"/>
+      <point x="119" y="166" type="curve" smooth="yes"/>
+      <point x="119" y="480" type="line"/>
+      <point x="98" y="480" type="line"/>
+      <point x="98" y="166" type="line" smooth="yes"/>
+      <point x="98" y="57"/>
+      <point x="161" y="-6"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="442" y="0" type="line"/>
-      <point x="442" y="480" type="line"/>
-      <point x="421" y="480" type="line"/>
-      <point x="421" y="76" type="line"/>
+      <point x="431" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="480" type="line"/>
+      <point x="427" y="480" type="line"/>
+      <point x="427" y="76" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/uacute.glif b/src/Cantarell-Light.ufo/glyphs/uacute.glif
index f106282a..f4c14291 100644
--- a/src/Cantarell-Light.ufo/glyphs/uacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uacute" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="00FA"/>
   <outline>
     <component base="u"/>
-    <component base="acutecomb" xOffset="194"/>
+    <component base="acutecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ubreve.glif b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
index 554e9c82..5c995de3 100644
--- a/src/Cantarell-Light.ufo/glyphs/ubreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ubreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ubreve" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="016D"/>
   <outline>
     <component base="u"/>
-    <component base="brevecomb" xOffset="75"/>
+    <component base="brevecomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucaron.glif b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
index 1fc977de..24649dba 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucaron" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="01D4"/>
   <outline>
     <component base="u"/>
-    <component base="caroncomb" xOffset="78"/>
+    <component base="caroncomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
index 13c2886e..785041e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ucircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ucircumflex" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="00FB"/>
   <outline>
     <component base="u"/>
-    <component base="circumflexcomb" xOffset="90"/>
+    <component base="circumflexcomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
index 20fe7be8..38db5461 100644
--- a/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udblgrave" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0215"/>
   <outline>
     <component base="u"/>
-    <component base="dblgravecomb" xOffset="9"/>
+    <component base="dblgravecomb" xOffset="15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
index e8db6863..c4677a18 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresis.glif b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
index 8b9e60bd..bfbbfb7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="00FC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb" xOffset="42"/>
+    <component base="dieresiscomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
index 802ff40f..30a35ef8 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisacute" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="01D8"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb.loclVIET" xOffset="42"/>
-    <component base="acutecomb" xOffset="194" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="acutecomb" xOffset="200" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
index b054d4f2..5db93963 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresiscaron" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="01DA"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb.loclVIET" xOffset="42"/>
-    <component base="caroncomb" xOffset="78" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="caroncomb" xOffset="84" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
index 09b249bd..51f408ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresisgrave" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="01DC"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb.loclVIET" xOffset="42"/>
-    <component base="gravecomb" xOffset="77" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="gravecomb" xOffset="83" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
index 0fa5dafc..976d52f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresismacron" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="01D6"/>
   <outline>
     <component base="u"/>
-    <component base="dieresiscomb.loclVIET" xOffset="42"/>
-    <component base="macroncomb" xOffset="18" yOffset="79"/>
+    <component base="dieresiscomb.loclVIET" xOffset="48"/>
+    <component base="macroncomb" xOffset="24" yOffset="79"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
index d6d8d3d2..826f3283 100644
--- a/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/udotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udotbelow" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="1EE5"/>
   <outline>
     <component base="u"/>
-    <component base="dotbelowcomb" xOffset="141"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ugrave.glif b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
index af72e863..16f0d844 100644
--- a/src/Cantarell-Light.ufo/glyphs/ugrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ugrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ugrave" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="00F9"/>
   <outline>
     <component base="u"/>
-    <component base="gravecomb" xOffset="77"/>
+    <component base="gravecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
index df09a313..b8c05932 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhookabove" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="1EE7"/>
   <outline>
     <component base="u"/>
-    <component base="hookabovecomb" xOffset="109"/>
+    <component base="hookabovecomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorn.glif b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
index e1b760dd..cd9857b7 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorn" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="01B0"/>
   <outline>
     <component base="u"/>
-    <component base="horncomb" xOffset="370" yOffset="-2"/>
+    <component base="horncomb" xOffset="376" yOffset="-2"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
index 094fce49..d90c8f4d 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornacute" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="1EE9"/>
   <outline>
     <component base="uhorn"/>
-    <component base="acutecomb" xOffset="194"/>
+    <component base="acutecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
index 10d8b057..0d683126 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorndotbelow" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="1EF1"/>
   <outline>
     <component base="uhorn"/>
-    <component base="dotbelowcomb" xOffset="141"/>
+    <component base="dotbelowcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
index e8e39ef0..134a7a3c 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorngrave" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="1EEB"/>
   <outline>
     <component base="uhorn"/>
-    <component base="gravecomb" xOffset="77"/>
+    <component base="gravecomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
index 3eabce91..10aa9971 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhornhookabove" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="1EED"/>
   <outline>
     <component base="uhorn"/>
-    <component base="hookabovecomb" xOffset="109"/>
+    <component base="hookabovecomb" xOffset="115"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
index babd6f3f..a59a17d8 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhorntilde" format="2">
-  <advance width="606"/>
+  <advance width="619"/>
   <unicode hex="1EEF"/>
   <outline>
     <component base="uhorn"/>
-    <component base="tildecomb" xOffset="26"/>
+    <component base="tildecomb" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
index 38bbcf1f..374242f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
index aee6ae64..cf88c342 100644
--- a/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uhungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0171"/>
   <outline>
     <component base="u"/>
-    <component base="hungarumlautcomb" xOffset="120"/>
+    <component base="hungarumlautcomb" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
index 43a3539e..68463764 100644
--- a/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uinvertedbreve" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0217"/>
   <outline>
     <component base="u"/>
-    <component base="breveinvertedcomb" xOffset="60"/>
+    <component base="breveinvertedcomb" xOffset="66"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
index e3ef3f9c..ff490288 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacron.glif b/src/Cantarell-Light.ufo/glyphs/umacron.glif
index ff8b9434..4de509e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="016B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb" xOffset="18"/>
+    <component base="macroncomb" xOffset="24"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
index f63f88ec..e0223a17 100644
--- a/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/umacrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacrondieresis" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="1E7B"/>
   <outline>
     <component base="u"/>
-    <component base="macroncomb.loclVIET" xOffset="23"/>
-    <component base="dieresiscomb" xOffset="42" yOffset="69"/>
+    <component base="macroncomb.loclVIET" xOffset="29"/>
+    <component base="dieresiscomb" xOffset="48" yOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uogonek.glif b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
index 519709fd..7d061599 100644
--- a/src/Cantarell-Light.ufo/glyphs/uogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uogonek" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0173"/>
   <outline>
     <component base="u"/>
-    <component base="ogonekcomb" xOffset="35"/>
+    <component base="ogonekcomb" xOffset="41"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/uring.glif b/src/Cantarell-Light.ufo/glyphs/uring.glif
index b86df4b7..c06e3ea9 100644
--- a/src/Cantarell-Light.ufo/glyphs/uring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/uring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uring" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="016F"/>
   <outline>
     <component base="u"/>
-    <component base="ringcomb" xOffset="87"/>
+    <component base="ringcomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
index 069192ca..01546ff4 100644
--- a/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ushort-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
index dce7e0cd..11851d61 100644
--- a/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ustraight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraight-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="04AF"/>
   <anchor x="228" y="-6" name="center"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
index fab74e72..b149732b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ustraightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraightstroke-cy" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="ustraight-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/utilde.glif b/src/Cantarell-Light.ufo/glyphs/utilde.glif
index 17165dca..b4c8ebde 100644
--- a/src/Cantarell-Light.ufo/glyphs/utilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utilde" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="0169"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="26"/>
+    <component base="tildecomb" xOffset="32"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
index 93fbb656..65266c76 100644
--- a/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/utildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="utildeacute" format="2">
-  <advance width="542"/>
+  <advance width="555"/>
   <unicode hex="1E79"/>
   <outline>
     <component base="u"/>
-    <component base="tildecomb" xOffset="26"/>
-    <component base="acutecomb" xOffset="194" yOffset="132"/>
+    <component base="tildecomb" xOffset="32"/>
+    <component base="acutecomb" xOffset="200" yOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/v.glif b/src/Cantarell-Light.ufo/glyphs/v.glif
index 28192b84..9c9a15f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/v.glif
+++ b/src/Cantarell-Light.ufo/glyphs/v.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="v" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="0076"/>
   <note>
 v
 </note>
-  <anchor x="224" y="0" name="bottom"/>
-  <anchor x="224" y="480" name="top"/>
+  <anchor x="232" y="0" name="bottom"/>
+  <anchor x="232" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="216" y="0" type="line"/>
-      <point x="234" y="0" type="line"/>
-      <point x="423" y="480" type="line"/>
-      <point x="402" y="480" type="line"/>
-      <point x="221" y="14" type="line"/>
-      <point x="230" y="14" type="line"/>
-      <point x="47" y="480" type="line"/>
-      <point x="24" y="480" type="line"/>
+      <point x="224" y="0" type="line"/>
+      <point x="242" y="0" type="line"/>
+      <point x="431" y="480" type="line"/>
+      <point x="410" y="480" type="line"/>
+      <point x="229" y="14" type="line"/>
+      <point x="238" y="14" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
index a3e5db2e..f739dd04 100644
--- a/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ve-cy.glif
@@ -1,43 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ve-cy" format="2">
-  <advance width="502"/>
+  <advance width="509"/>
   <unicode hex="0432"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="261" y="0" type="line" smooth="yes"/>
-      <point x="378" y="0"/>
-      <point x="444" y="48"/>
-      <point x="444" y="130" type="curve" smooth="yes"/>
-      <point x="444" y="209"/>
-      <point x="382" y="261"/>
-      <point x="288" y="261" type="curve" smooth="yes"/>
-      <point x="114" y="261" type="line"/>
-      <point x="114" y="244" type="line"/>
-      <point x="280" y="244" type="line" smooth="yes"/>
-      <point x="367" y="244"/>
-      <point x="423" y="198"/>
-      <point x="423" y="126" type="curve" smooth="yes"/>
-      <point x="423" y="55"/>
-      <point x="368" y="17"/>
-      <point x="270" y="17" type="curve" smooth="yes"/>
-      <point x="120" y="17" type="line"/>
-      <point x="120" y="463" type="line"/>
-      <point x="259" y="463" type="line" smooth="yes"/>
-      <point x="355" y="463"/>
-      <point x="408" y="426"/>
-      <point x="408" y="358" type="curve" smooth="yes"/>
-      <point x="408" y="306"/>
-      <point x="372" y="268"/>
-      <point x="310" y="254" type="curve"/>
-      <point x="337" y="252" type="line"/>
-      <point x="392" y="262"/>
-      <point x="429" y="307"/>
-      <point x="429" y="365" type="curve" smooth="yes"/>
-      <point x="429" y="439"/>
-      <point x="367" y="480"/>
-      <point x="259" y="480" type="curve" smooth="yes"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="268" y="0" type="line" smooth="yes"/>
+      <point x="385" y="0"/>
+      <point x="451" y="48"/>
+      <point x="451" y="130" type="curve" smooth="yes"/>
+      <point x="451" y="209"/>
+      <point x="389" y="261"/>
+      <point x="295" y="261" type="curve" smooth="yes"/>
+      <point x="121" y="261" type="line"/>
+      <point x="121" y="244" type="line"/>
+      <point x="287" y="244" type="line" smooth="yes"/>
+      <point x="374" y="244"/>
+      <point x="430" y="198"/>
+      <point x="430" y="126" type="curve" smooth="yes"/>
+      <point x="430" y="55"/>
+      <point x="375" y="17"/>
+      <point x="277" y="17" type="curve" smooth="yes"/>
+      <point x="127" y="17" type="line"/>
+      <point x="127" y="463" type="line"/>
+      <point x="266" y="463" type="line" smooth="yes"/>
+      <point x="362" y="463"/>
+      <point x="415" y="426"/>
+      <point x="415" y="358" type="curve" smooth="yes"/>
+      <point x="415" y="306"/>
+      <point x="379" y="268"/>
+      <point x="317" y="254" type="curve"/>
+      <point x="344" y="252" type="line"/>
+      <point x="399" y="262"/>
+      <point x="436" y="307"/>
+      <point x="436" y="365" type="curve" smooth="yes"/>
+      <point x="436" y="439"/>
+      <point x="374" y="480"/>
+      <point x="266" y="480" type="curve" smooth="yes"/>
+      <point x="107" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/w.glif b/src/Cantarell-Light.ufo/glyphs/w.glif
index 285bd326..49d2eea3 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="754"/>
+  <advance width="760"/>
   <unicode hex="0077"/>
   <note>
 w
 </note>
-  <anchor x="381" y="0" name="bottom"/>
-  <anchor x="381" y="480" name="top"/>
+  <anchor x="384" y="0" name="bottom"/>
+  <anchor x="384" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="197" y="0" type="line"/>
-      <point x="212" y="0" type="line"/>
-      <point x="380" y="459" type="line"/>
-      <point x="373" y="459" type="line"/>
-      <point x="551" y="0" type="line"/>
-      <point x="565" y="0" type="line"/>
-      <point x="722" y="480" type="line"/>
-      <point x="701" y="480" type="line"/>
-      <point x="556" y="25" type="line"/>
-      <point x="562" y="25" type="line"/>
-      <point x="387" y="479" type="line"/>
-      <point x="367" y="479" type="line"/>
-      <point x="203" y="25" type="line"/>
-      <point x="208" y="25" type="line"/>
-      <point x="54" y="480" type="line"/>
-      <point x="32" y="480" type="line"/>
+      <point x="200" y="0" type="line"/>
+      <point x="215" y="0" type="line"/>
+      <point x="383" y="459" type="line"/>
+      <point x="376" y="459" type="line"/>
+      <point x="554" y="0" type="line"/>
+      <point x="568" y="0" type="line"/>
+      <point x="725" y="480" type="line"/>
+      <point x="704" y="480" type="line"/>
+      <point x="559" y="25" type="line"/>
+      <point x="565" y="25" type="line"/>
+      <point x="390" y="479" type="line"/>
+      <point x="370" y="479" type="line"/>
+      <point x="206" y="25" type="line"/>
+      <point x="211" y="25" type="line"/>
+      <point x="57" y="480" type="line"/>
+      <point x="35" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/wacute.glif b/src/Cantarell-Light.ufo/glyphs/wacute.glif
index fbd55983..7049c237 100644
--- a/src/Cantarell-Light.ufo/glyphs/wacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wacute" format="2">
-  <advance width="754"/>
+  <advance width="760"/>
   <unicode hex="1E83"/>
   <outline>
     <component base="w"/>
-    <component base="acutecomb" xOffset="314"/>
+    <component base="acutecomb" xOffset="317"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
index 2fc9b223..7a0dbf99 100644
--- a/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wcircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wcircumflex" format="2">
-  <advance width="754"/>
+  <advance width="760"/>
   <unicode hex="0175"/>
   <outline>
     <component base="w"/>
-    <component base="circumflexcomb" xOffset="210"/>
+    <component base="circumflexcomb" xOffset="213"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
index dfd53360..3ccb6ef4 100644
--- a/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wdieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wdieresis" format="2">
-  <advance width="754"/>
+  <advance width="760"/>
   <unicode hex="1E85"/>
   <outline>
     <component base="w"/>
-    <component base="dieresiscomb" xOffset="162"/>
+    <component base="dieresiscomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/we-cy.glif b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
index d3484718..38d78c1c 100644
--- a/src/Cantarell-Light.ufo/glyphs/we-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/we-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="we-cy" format="2">
-  <advance width="754"/>
+  <advance width="760"/>
   <unicode hex="051D"/>
   <outline>
     <component base="w"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/wgrave.glif b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
index f48615eb..37d61141 100644
--- a/src/Cantarell-Light.ufo/glyphs/wgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/wgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="wgrave" format="2">
-  <advance width="754"/>
+  <advance width="760"/>
   <unicode hex="1E81"/>
   <outline>
     <component base="w"/>
-    <component base="gravecomb" xOffset="197"/>
+    <component base="gravecomb" xOffset="200"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/x.glif b/src/Cantarell-Light.ufo/glyphs/x.glif
index 0e2d3f8e..a2fa29ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/x.glif
+++ b/src/Cantarell-Light.ufo/glyphs/x.glif
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="x" format="2">
-  <advance width="442"/>
+  <advance width="446"/>
   <unicode hex="0078"/>
   <note>
 x
 </note>
-  <anchor x="222" y="0" name="bottom"/>
-  <anchor x="220" y="480" name="top"/>
+  <anchor x="224" y="0" name="bottom"/>
+  <anchor x="222" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="33" y="0" type="line"/>
-      <point x="55" y="0" type="line"/>
-      <point x="225" y="238" type="line"/>
-      <point x="415" y="480" type="line"/>
-      <point x="393" y="480" type="line"/>
-      <point x="215" y="251" type="line"/>
+      <point x="35" y="0" type="line"/>
+      <point x="57" y="0" type="line"/>
+      <point x="227" y="238" type="line"/>
+      <point x="417" y="480" type="line"/>
+      <point x="395" y="480" type="line"/>
+      <point x="217" y="251" type="line"/>
     </contour>
     <contour>
-      <point x="378" y="0" type="line"/>
-      <point x="402" y="0" type="line"/>
-      <point x="225" y="250" type="line"/>
-      <point x="54" y="480" type="line"/>
-      <point x="30" y="480" type="line"/>
-      <point x="213" y="235" type="line"/>
+      <point x="380" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="227" y="250" type="line"/>
+      <point x="56" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="215" y="235" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/y.glif b/src/Cantarell-Light.ufo/glyphs/y.glif
index 7798c225..43fff275 100644
--- a/src/Cantarell-Light.ufo/glyphs/y.glif
+++ b/src/Cantarell-Light.ufo/glyphs/y.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="0079"/>
   <note>
 y
 </note>
-  <anchor x="330" y="0" name="bottom"/>
-  <anchor x="212" y="480" name="top"/>
+  <anchor x="338" y="0" name="bottom"/>
+  <anchor x="220" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="132" y="-217" type="line"/>
-      <point x="155" y="-217" type="line"/>
-      <point x="234" y="0" type="line"/>
-      <point x="423" y="480" type="line"/>
-      <point x="402" y="480" type="line"/>
-      <point x="222" y="18" type="line"/>
-      <point x="228" y="18" type="line"/>
-      <point x="47" y="480" type="line"/>
-      <point x="24" y="480" type="line"/>
-      <point x="216" y="0" type="line"/>
+      <point x="140" y="-217" type="line"/>
+      <point x="163" y="-217" type="line"/>
+      <point x="242" y="0" type="line"/>
+      <point x="431" y="480" type="line"/>
+      <point x="410" y="480" type="line"/>
+      <point x="230" y="18" type="line"/>
+      <point x="236" y="18" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="224" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/yacute.glif b/src/Cantarell-Light.ufo/glyphs/yacute.glif
index c29be923..dd24cd8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/yacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yacute" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="145"/>
+    <component base="acutecomb" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif b/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
index ebdd2e9d..cd16abce 100644
--- a/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ycircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ycircumflex" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="41"/>
+    <component base="circumflexcomb" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydieresis.glif b/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
index e2480673..15465512 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydieresis" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-7"/>
+    <component base="dieresiscomb" xOffset="1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif b/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
index 5be0eff6..143e50b4 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotaccent" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="93"/>
+    <component base="dotaccentcomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif b/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
index f83b1471..ab38b327 100644
--- a/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ydotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotbelow" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="210"/>
+    <component base="dotbelowcomb" xOffset="218"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
index 47df1000..28477eec 100644
--- a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yeru-cy" format="2">
-  <advance width="657"/>
+  <advance width="671"/>
   <unicode hex="044B"/>
-  <anchor x="329" y="480" name="top"/>
+  <anchor x="336" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="100" y="0" type="line"/>
-      <point x="261" y="0" type="line" smooth="yes"/>
-      <point x="373" y="0"/>
-      <point x="440" y="56"/>
-      <point x="440" y="150" type="curve" smooth="yes"/>
-      <point x="440" y="241"/>
-      <point x="379" y="301"/>
-      <point x="288" y="301" type="curve" smooth="yes"/>
-      <point x="113" y="301" type="line"/>
-      <point x="113" y="284" type="line"/>
-      <point x="280" y="284" type="line" smooth="yes"/>
-      <point x="362" y="284"/>
-      <point x="418" y="228"/>
-      <point x="418" y="145" type="curve" smooth="yes"/>
-      <point x="418" y="65"/>
-      <point x="363" y="17"/>
-      <point x="270" y="17" type="curve" smooth="yes"/>
-      <point x="121" y="17" type="line"/>
-      <point x="121" y="480" type="line"/>
-      <point x="100" y="480" type="line"/>
+      <point x="107" y="0" type="line"/>
+      <point x="268" y="0" type="line" smooth="yes"/>
+      <point x="380" y="0"/>
+      <point x="447" y="56"/>
+      <point x="447" y="150" type="curve" smooth="yes"/>
+      <point x="447" y="241"/>
+      <point x="386" y="301"/>
+      <point x="295" y="301" type="curve" smooth="yes"/>
+      <point x="120" y="301" type="line"/>
+      <point x="120" y="284" type="line"/>
+      <point x="287" y="284" type="line" smooth="yes"/>
+      <point x="369" y="284"/>
+      <point x="425" y="228"/>
+      <point x="425" y="145" type="curve" smooth="yes"/>
+      <point x="425" y="65"/>
+      <point x="370" y="17"/>
+      <point x="277" y="17" type="curve" smooth="yes"/>
+      <point x="128" y="17" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="536" y="0" type="line"/>
-      <point x="557" y="0" type="line"/>
-      <point x="557" y="480" type="line"/>
-      <point x="536" y="480" type="line"/>
+      <point x="543" y="0" type="line"/>
+      <point x="564" y="0" type="line"/>
+      <point x="564" y="480" type="line"/>
+      <point x="543" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
index 79e788cc..1958464a 100644
--- a/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yerudieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yerudieresis-cy" format="2">
-  <advance width="657"/>
+  <advance width="671"/>
   <unicode hex="04F9"/>
   <outline>
     <component base="yeru-cy"/>
-    <component base="dieresiscomb" xOffset="110"/>
+    <component base="dieresiscomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ygrave.glif b/src/Cantarell-Light.ufo/glyphs/ygrave.glif
index 1d60ecce..381995fa 100644
--- a/src/Cantarell-Light.ufo/glyphs/ygrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ygrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ygrave" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="28"/>
+    <component base="gravecomb" xOffset="36"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yhookabove.glif b/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
index 2743bfa5..470d80be 100644
--- a/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yhookabove" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="60"/>
+    <component base="hookabovecomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
index c42cf6bb..d86c62bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yi-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yi-cy" format="2">
-  <advance width="221"/>
+  <advance width="235"/>
   <unicode hex="0457"/>
   <outline>
     <component base="idotless"/>
-    <component base="dieresiscomb" xOffset="-107"/>
+    <component base="dieresiscomb" xOffset="-100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ymacron.glif b/src/Cantarell-Light.ufo/glyphs/ymacron.glif
index d84c460f..d361ab02 100644
--- a/src/Cantarell-Light.ufo/glyphs/ymacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ymacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ymacron" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="-31"/>
+    <component base="macroncomb" xOffset="-23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ytilde.glif b/src/Cantarell-Light.ufo/glyphs/ytilde.glif
index f9985714..5daec636 100644
--- a/src/Cantarell-Light.ufo/glyphs/ytilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ytilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ytilde" format="2">
-  <advance width="447"/>
+  <advance width="463"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="-23"/>
+    <component base="tildecomb" xOffset="-15"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/z.glif b/src/Cantarell-Light.ufo/glyphs/z.glif
index fbb7d12c..0ff42c75 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="439"/>
+  <advance width="451"/>
   <unicode hex="007A"/>
   <note>
 z
 </note>
-  <anchor x="219" y="0" name="bottom"/>
-  <anchor x="219" y="480" name="top"/>
+  <anchor x="225" y="0" name="bottom"/>
+  <anchor x="225" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="43" y="0" type="line"/>
-      <point x="398" y="0" type="line"/>
-      <point x="398" y="17" type="line"/>
-      <point x="62" y="17" type="line"/>
-      <point x="64" y="13" type="line"/>
-      <point x="388" y="464" type="line"/>
-      <point x="388" y="480" type="line"/>
-      <point x="43" y="480" type="line"/>
-      <point x="43" y="463" type="line"/>
-      <point x="369" y="463" type="line"/>
-      <point x="367" y="467" type="line"/>
-      <point x="43" y="15" type="line"/>
+      <point x="49" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="404" y="17" type="line"/>
+      <point x="68" y="17" type="line"/>
+      <point x="70" y="13" type="line"/>
+      <point x="394" y="464" type="line"/>
+      <point x="394" y="480" type="line"/>
+      <point x="49" y="480" type="line"/>
+      <point x="49" y="463" type="line"/>
+      <point x="375" y="463" type="line"/>
+      <point x="373" y="467" type="line"/>
+      <point x="49" y="15" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zacute.glif b/src/Cantarell-Light.ufo/glyphs/zacute.glif
index 259bd599..b13ba5d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/zacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zacute" format="2">
-  <advance width="439"/>
+  <advance width="451"/>
   <unicode hex="017A"/>
   <outline>
     <component base="z"/>
-    <component base="acutecomb" xOffset="152"/>
+    <component base="acutecomb" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zcaron.glif b/src/Cantarell-Light.ufo/glyphs/zcaron.glif
index 807a67f4..9c844db2 100644
--- a/src/Cantarell-Light.ufo/glyphs/zcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zcaron" format="2">
-  <advance width="439"/>
+  <advance width="451"/>
   <unicode hex="017E"/>
   <outline>
     <component base="z"/>
-    <component base="caroncomb" xOffset="36"/>
+    <component base="caroncomb" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif b/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
index 702e803c..bc543d10 100644
--- a/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotaccent" format="2">
-  <advance width="439"/>
+  <advance width="451"/>
   <unicode hex="017C"/>
   <outline>
     <component base="z"/>
-    <component base="dotaccentcomb" xOffset="100"/>
+    <component base="dotaccentcomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif b/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
index 59b325c2..f65b81f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zdotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zdotbelow" format="2">
-  <advance width="439"/>
+  <advance width="451"/>
   <unicode hex="1E93"/>
   <outline>
     <component base="z"/>
-    <component base="dotbelowcomb" xOffset="99"/>
+    <component base="dotbelowcomb" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index 337682cd..2acdf277 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -1269,7 +1269,7 @@
     <key>com.schriftgestaltung.customParameter.GSFontMaster.iconName</key>
     <string></string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramArea</key>
-    <string>420</string>
+    <string>510</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramDepth</key>
     <string>16</string>
     <key>com.schriftgestaltung.customParameter.GSFontMaster.paramOver</key>


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