[cantarell-fonts/respacing: 2/2] Respace other Latin glyphs, fix some anchor attachments



commit 97b6c81efd8c07d2ff3dcca17aadd4ab57826190
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sun May 19 22:56:30 2019 +0100

    Respace other Latin glyphs, fix some anchor attachments

 .../glyphs/A_circumflexacute.glif                  |  2 +-
 .../glyphs/A_circumflexgrave.glif                  |  2 +-
 .../glyphs/A_circumflexhookabove.glif              |  2 +-
 .../glyphs/A_circumflextilde.glif                  |  2 +-
 .../glyphs/E_circumflexacute.glif                  |  2 +-
 .../glyphs/E_circumflexgrave.glif                  |  2 +-
 .../glyphs/E_circumflexhookabove.glif              |  2 +-
 .../glyphs/E_circumflextilde.glif                  |  2 +-
 .../glyphs/O_circumflexacute.glif                  |  2 +-
 .../glyphs/O_circumflexgrave.glif                  |  2 +-
 .../glyphs/O_circumflexhookabove.glif              |  2 +-
 .../glyphs/O_circumflextilde.glif                  |  2 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  2 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_acutecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_gravecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_gravecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  | 15 ++++-
 .../glyphs/circumflexcomb_hookabovecomb.glif       | 11 ++++
 .../glyphs/circumflexcomb_tildecomb.case.glif      | 15 ++++-
 src/Cantarell-Bold.ufo/lib.plist                   |  2 +-
 .../glyphs/A_circumflexacute.glif                  |  2 +-
 .../glyphs/A_circumflexgrave.glif                  |  2 +-
 .../glyphs/A_circumflexhookabove.glif              |  2 +-
 .../glyphs/A_circumflextilde.glif                  |  2 +-
 .../glyphs/E_circumflexacute.glif                  |  2 +-
 .../glyphs/E_circumflexgrave.glif                  |  2 +-
 .../glyphs/E_circumflexhookabove.glif              |  2 +-
 .../glyphs/E_circumflextilde.glif                  |  2 +-
 .../glyphs/O_circumflexacute.glif                  |  2 +-
 .../glyphs/O_circumflexgrave.glif                  |  2 +-
 .../glyphs/O_circumflexhookabove.glif              |  2 +-
 .../glyphs/O_circumflextilde.glif                  |  2 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  2 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_acutecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_gravecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_gravecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  | 15 ++++-
 .../glyphs/circumflexcomb_hookabovecomb.glif       | 11 ++++
 .../glyphs/circumflexcomb_tildecomb.case.glif      |  4 +-
 .../glyphs/circumflexcomb_tildecomb.glif           | 11 ++++
 src/Cantarell-Light.ufo/lib.plist                  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_E_.glif         |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif |  4 +-
 .../glyphs/A_brevedotbelow.glif                    |  6 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif |  4 +-
 .../glyphs/A_brevehookabove.glif                   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif |  4 +-
 .../glyphs/A_circumflexacute.glif                  |  4 +-
 .../glyphs/A_circumflexdotbelow.glif               |  6 +-
 .../glyphs/A_circumflexgrave.glif                  |  4 +-
 .../glyphs/A_circumflexhookabove.glif              |  4 +-
 .../glyphs/A_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif   |  4 +-
 .../glyphs/A_dieresis-cy.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif      |  2 +-
 .../glyphs/A_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ring.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/A_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif    |  4 +-
 .../glyphs/C_cedillaacute.glif                     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_croat.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_caron.glif      |  4 +-
 .../glyphs/E_cedillabreve.glif                     |  6 +-
 src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif |  4 +-
 .../glyphs/E_circumflexacute.glif                  |  4 +-
 .../glyphs/E_circumflexdotbelow.glif               |  6 +-
 .../glyphs/E_circumflexgrave.glif                  |  4 +-
 .../glyphs/E_circumflexhookabove.glif              |  4 +-
 .../glyphs/E_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif  |  4 +-
 .../glyphs/E_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_macron.glif     |  4 +-
 .../glyphs/E_macronacute.glif                      |  6 +-
 .../glyphs/E_macrongrave.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif       |  2 +-
 .../glyphs/E_sdescender-cy.glif                    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_th.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/E_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/G_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif |  4 +-
 .../glyphs/G_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif  | 76 +++++++++++-----------
 src/Cantarell-Regular.ufo/glyphs/G_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/H_bar.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif   |  4 +-
 .../glyphs/I_dieresisacute.glif                    |  6 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif  |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif  |  4 +-
 .../glyphs/I_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/K_acute.glif      |  4 +-
 .../glyphs/K_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_J_.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_caron.glif      |  4 +-
 .../glyphs/L_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dot.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_j.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/L_slash.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_J_.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_caron.glif      |  4 +-
 .../glyphs/N_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_j.glif          |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/N_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_-cy.glif        |  2 +-
 src/Cantarell-Regular.ufo/glyphs/O_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif |  4 +-
 .../glyphs/O_circumflexacute.glif                  |  4 +-
 .../glyphs/O_circumflexdotbelow.glif               |  6 +-
 .../glyphs/O_circumflexgrave.glif                  |  4 +-
 .../glyphs/O_circumflexhookabove.glif              |  4 +-
 .../glyphs/O_circumflextilde.glif                  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif   |  4 +-
 .../glyphs/O_dieresis-cy.glif                      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif   |  4 +-
 .../glyphs/O_dieresismacron.glif                   |  6 +-
 .../glyphs/O_dotaccentmacron.glif                  |  6 +-
 src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horn.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif  |  4 +-
 .../glyphs/O_horndotbelow.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif  |  4 +-
 .../glyphs/O_hornhookabove.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif  |  4 +-
 .../glyphs/O_hungarumlaut.glif                     |  4 +-
 .../glyphs/O_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_macron.glif     |  4 +-
 .../glyphs/O_macronacute.glif                      |  6 +-
 .../glyphs/O_macrongrave.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slash.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif |  6 +-
 .../glyphs/O_tildedieresis.glif                    |  6 +-
 .../glyphs/O_tildemacron.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/R_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_caron.glif      |  4 +-
 .../glyphs/R_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif   |  4 +-
 .../glyphs/R_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_acute.glif      |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_caron.glif      |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/S_chwa.glif       | 68 +++++++++----------
 src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif |  4 +-
 .../glyphs/S_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif   |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Regular.ufo/glyphs/T_bar.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif    |  4 +-
 .../glyphs/T_commaaccent.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_breve.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif   |  4 +-
 .../glyphs/U_dieresisacute.glif                    |  6 +-
 .../glyphs/U_dieresiscaron.glif                    |  6 +-
 .../glyphs/U_dieresisgrave.glif                    |  6 +-
 .../glyphs/U_dieresismacron.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horn.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif  |  4 +-
 .../glyphs/U_horndotbelow.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif  |  4 +-
 .../glyphs/U_hornhookabove.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif  |  4 +-
 .../glyphs/U_hungarumlaut.glif                     |  4 +-
 .../glyphs/U_invertedbreve.glif                    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_macron.glif     |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_ring.glif       |  4 +-
 .../glyphs/U_straight-cy.glif                      |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Regular.ufo/glyphs/U_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif |  6 +-
 src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/Y_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_grave.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_macron.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_acute.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_caron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif   |  4 +-
 .../glyphs/acutecomb_dotaccentcomb.glif            |  2 +-
 src/Cantarell-Regular.ufo/glyphs/cacute.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ccaron.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ccedilla.glif     |  4 +-
 .../glyphs/ccedillaacute.glif                      |  6 +-
 src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif  |  4 +-
 src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif   |  4 +-
 .../glyphs/circumflexcomb_acutecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_acutecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_gravecomb.case.glif      | 15 ++++-
 .../glyphs/circumflexcomb_gravecomb.glif           | 11 ++++
 .../glyphs/circumflexcomb_hookabovecomb.case.glif  | 15 ++++-
 .../glyphs/circumflexcomb_hookabovecomb.glif       | 11 ++++
 .../glyphs/circumflexcomb_tildecomb.case.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/es-cy.glif        |  2 +-
 .../glyphs/esdescender-cy.glif                     |  2 +-
 src/Cantarell-Regular.ufo/glyphs/fita-cy.glif      |  2 +-
 src/Cantarell-Regular.ufo/glyphs/o-cy.glif         |  2 +-
 src/Cantarell-Regular.ufo/glyphs/oacute.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/obreve.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ocaron.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif  |  4 +-
 .../glyphs/ocircumflexacute.glif                   |  4 +-
 .../glyphs/ocircumflexdotbelow.glif                |  6 +-
 .../glyphs/ocircumflexgrave.glif                   |  4 +-
 .../glyphs/ocircumflexhookabove.glif               |  4 +-
 .../glyphs/ocircumflextilde.glif                   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/odblgrave.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif |  2 +-
 src/Cantarell-Regular.ufo/glyphs/odieresis.glif    |  4 +-
 .../glyphs/odieresismacron.glif                    |  4 +-
 .../glyphs/odotaccentmacron.glif                   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/odotbelow.glif    |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ograve.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ohookabove.glif   |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorn.glif        |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ohornacute.glif   |  4 +-
 .../glyphs/ohorndotbelow.glif                      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif   |  4 +-
 .../glyphs/ohornhookabove.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif   |  4 +-
 .../glyphs/ohungarumlaut.glif                      |  4 +-
 .../glyphs/oinvertedbreve.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/omacron.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/omacronacute.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/oogonek.glif      |  4 +-
 src/Cantarell-Regular.ufo/glyphs/otilde.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/otildeacute.glif  |  4 +-
 .../glyphs/otildedieresis.glif                     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/otildemacron.glif |  4 +-
 src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif  |  2 +-
 src/Cantarell-Regular.ufo/lib.plist                |  2 +-
 335 files changed, 900 insertions(+), 680 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
index a4aac8f5..6e1217da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="200" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
index 7692ba3c..6f93652b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="200" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
index ade16912..7a979a01 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="166" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="200" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
index 469bf630..433efc5c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="146" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="180" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
index 2f24ab47..a54845e8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="160" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
index 7734085f..e06b4797 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="160" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
index 6092e193..14206462 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="126" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="160" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
index df68d7e2..72ae77bc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="106" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="140" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
index 856453d5..dd82387e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="227" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
index 40d4910a..b82d4a21 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="227" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
index f68705c8..7d7b4e20 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="193" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="227" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
index 3c58eba7..fe03618b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="173" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="207" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/acutecomb_dotaccentcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/acutecomb_dotaccentcomb.glif
index 91928cb7..2b7d2570 100644
--- a/src/Cantarell-Bold.ufo/glyphs/acutecomb_dotaccentcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/acutecomb_dotaccentcomb.glif
@@ -2,7 +2,7 @@
 <glyph name="acutecomb_dotaccentcomb" format="2">
   <outline>
     <component base="acutecomb.loclVIET"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="-133" yOffset="168"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="-33" yOffset="257"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.case.glif
index 7a5c21c7..2c487110 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_acutecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-51" yOffset="200"/>
-    <component base="acutecomb.loclVIET" yxScale="0.06993" xOffset="260" yOffset="341"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-51" yOffset="200"/>
+    <component base="acutecomb.loclVIET" xOffset="244" yOffset="323"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>570</integer>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.glif
index 6fe86934..c639c235 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_acutecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>413</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.case.glif
index 74d0c9a6..caefa7e8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_gravecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-51" yOffset="200"/>
-    <component base="gravecomb.loclVIET" yxScale="0.06993" xOffset="131" yOffset="341"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-51" yOffset="200"/>
+    <component base="gravecomb.loclVIET" xOffset="154" yOffset="323"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>470</integer>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.glif
index a76707ca..991a2fe2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_gravecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>413</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
index b9fb73aa..df4b5c46 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_hookabovecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-51" yOffset="200"/>
-    <component base="hookabovecomb.loclVIET" yxScale="0.06993" xOffset="186" yOffset="341"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-51" yOffset="200"/>
+    <component base="hookabovecomb.loclVIET" xOffset="177" yOffset="322"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>541</integer>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.glif
index 63610ff8..d43013b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_hookabovecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>600</integer>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_tildecomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_tildecomb.case.glif
index a7578685..3b1c43d9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_tildecomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb_tildecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_tildecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-31" yOffset="200"/>
-    <component base="tildecomb.loclVIET" yxScale="0.06993" xOffset="-46" yOffset="409"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-31" yOffset="200"/>
+    <component base="tildecomb.loclVIET" xOffset="-45" yOffset="340"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>447</integer>
     </dict>
diff --git a/src/Cantarell-Bold.ufo/lib.plist b/src/Cantarell-Bold.ufo/lib.plist
index 93c61c31..040f82b8 100644
--- a/src/Cantarell-Bold.ufo/lib.plist
+++ b/src/Cantarell-Bold.ufo/lib.plist
@@ -1333,7 +1333,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
index b280e2dd..dad442b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="203" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
index 68f7ee30..82ed3b2d 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="203" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
index febe5411..b02c3b31 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="169" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="203" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
index 6d0d4a2f..f9d221ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="127" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="161" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
index 157b43de..bb7613f1 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="180" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
index 3117d542..cd74e7ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="180" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
index e4a62966..2379586d 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="146" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="180" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
index 11d2c9b6..2c2a5a8c 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="104" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="138" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
index c2231d0f..29fe1f9e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="255" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
index 62676cd4..8e1e65a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="255" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
index 86727080..81be6ed8 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="221" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="255" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
index 1eb65b20..dcdd5f7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
@@ -4,6 +4,6 @@
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="179" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="213" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/acutecomb_dotaccentcomb.glif 
b/src/Cantarell-Light.ufo/glyphs/acutecomb_dotaccentcomb.glif
index 7fe9702f..314def1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/acutecomb_dotaccentcomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/acutecomb_dotaccentcomb.glif
@@ -2,7 +2,7 @@
 <glyph name="acutecomb_dotaccentcomb" format="2">
   <outline>
     <component base="acutecomb.loclVIET"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="-88" yOffset="97"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="-17" yOffset="202"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.case.glif
index d8fe3392..e826b84b 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_acutecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-53" yOffset="200"/>
-    <component base="acutecomb.loclVIET" xOffset="213" yOffset="276"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-53" yOffset="200"/>
+    <component base="acutecomb.loclVIET" xOffset="166" yOffset="274"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>478</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.glif
index 65c677b6..d3352bae 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_acutecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>362</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.case.glif
index 41618d4e..84fd0a83 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_gravecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-53" yOffset="200"/>
-    <component base="gravecomb.loclVIET" yxScale="0.06993" xOffset="84" yOffset="312"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-53" yOffset="200"/>
+    <component base="gravecomb.loclVIET" xOffset="62" yOffset="274"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>374</integer>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.glif
index 772b29e4..72e221b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_gravecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>362</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
index 3d806863..d2d739f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_hookabovecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-53" yOffset="200"/>
-    <component base="hookabovecomb.loclVIET" yxScale="0.06993" xOffset="111" yOffset="312"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-53" yOffset="200"/>
+    <component base="hookabovecomb.loclVIET" xOffset="93" yOffset="274"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>450</integer>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.glif
index 9fc303e3..a9091b18 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_hookabovecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>478</integer>
     </dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.case.glif
index 25dafe8e..6be092a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.case.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_tildecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-11" yOffset="200"/>
-    <component base="tildecomb.loclVIET" yxScale="0.06993" xOffset="-61" yOffset="357"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-11" yOffset="200"/>
+    <component base="tildecomb.loclVIET" xOffset="-62" yOffset="280"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.glif
index 4d3a8c4b..bf12db70 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb_tildecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>tildecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>432</integer>
     </dict>
diff --git a/src/Cantarell-Light.ufo/lib.plist b/src/Cantarell-Light.ufo/lib.plist
index 7a4688c7..31a2952a 100644
--- a/src/Cantarell-Light.ufo/lib.plist
+++ b/src/Cantarell-Light.ufo/lib.plist
@@ -1333,7 +1333,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
index b2b0da38..4b89ef7c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
index 42ab2f70..fc6999fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="977"/>
+  <advance width="969"/>
   <unicode hex="00C6"/>
   <anchor x="530" y="0" name="bottom"/>
   <anchor x="530" y="694" name="top"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
index 6e87ba81..9c312d2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_acute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="977"/>
+  <advance width="969"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
index d5d03555..ed0140d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="251"/>
+    <component base="acutecomb.case" xOffset="234"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
index 29fb7c6b..fbcd28dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Regular.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="677"/>
+  <advance width="642"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="124"/>
+    <component base="brevecomb-cy.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
index 01449a40..ebcb06f3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="130"/>
+    <component base="brevecomb.case" xOffset="113"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
index 1c104afa..41b89a07 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="164" yOffset="12"/>
+    <component base="brevecomb_acutecomb.case" xOffset="147" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
index 732e5b83..31c1f5c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="130"/>
+    <component base="dotbelowcomb" xOffset="186"/>
+    <component base="brevecomb.case" xOffset="113"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
index ef7feafd..c2532df2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="157" yOffset="12"/>
+    <component base="brevecomb_gravecomb.case" xOffset="140" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
index e9543c57..243010d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="162" yOffset="12"/>
+    <component base="brevecomb_hookabovecomb.case" xOffset="145" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
index 94422baf..a3fdcb37 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="133" yOffset="12"/>
+    <component base="brevecomb_tildecomb.case" xOffset="116" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
index 120e4b27..a82c6f0f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="155"/>
+    <component base="caroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
index 2b6db446..1f600d30 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="151"/>
+    <component base="circumflexcomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
index de4cdc70..a2755c57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="190" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
index 210177b8..ae49c0b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="151"/>
+    <component base="dotbelowcomb" xOffset="186"/>
+    <component base="circumflexcomb.case" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
index fc67cefe..2b0e069e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="190" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
index d68fef37..46138373 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="173" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="190" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
index 40b0167d..ae433804 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="140" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="157" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
index 94ad7570..ee5cbcf6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="118"/>
+    <component base="dblgravecomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
index 10ed757e..9652b40d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Regular.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="677"/>
+  <advance width="642"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
index 3234142f..a9433362 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
index dae0e255..3a7c2d8f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
index 0e011bb1..21147d36 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="144"/>
+    <component base="gravecomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
index 0f8b2d25..f817eb98 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="195"/>
+    <component base="hookabovecomb.case" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
index 7c00c804..ad59bb4d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="977"/>
+  <advance width="969"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
index 389eb32c..523fb8da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="142"/>
+    <component base="breveinvertedcomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
index 742da92c..fb38e94e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="97"/>
+    <component base="macroncomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
index 08c36e89..f0e3817c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="190"/>
+    <component base="ogonekcomb" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
index 93c0fe74..2285e9e9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="166"/>
+    <component base="ringcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
index c33672c5..a83b5a99 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="179"/>
+    <component base="ringcomb_acutecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
index 235b03e5..f50a3f78 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="677"/>
+  <advance width="642"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="99"/>
+    <component base="tildecomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
index 4c7182e0..65478cce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="286"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
index a66d0728..94239f3b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="190"/>
+    <component base="caroncomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
index de8c4521..dd587a67 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="227"/>
+    <component base="cedillacomb" xOffset="222"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
index f5e61a20..6c867dee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="227"/>
-    <component base="acutecomb.case" xOffset="286"/>
+    <component base="cedillacomb" xOffset="222"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
index d84d5e8e..d761a8ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="186"/>
+    <component base="circumflexcomb.case" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
index 8a51b93a..97982ec8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="238"/>
+    <component base="dotaccentcomb.case" xOffset="233"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
index 0e9bb595..c4138388 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1387"/>
+  <advance width="1355"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="733"/>
+    <component base="Zcaron" xOffset="717"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
index ef740280..3fd4b3e5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="733"/>
+  <advance width="717"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="150"/>
+    <component base="caroncomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
index 46441219..9f30c874 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="733"/>
+  <advance width="717"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
index 89e58ee6..de66eaef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="733"/>
+  <advance width="717"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="198"/>
+    <component base="dotbelowcomb" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
index c2c157cc..33af5ecb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="733"/>
+  <advance width="717"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="89"/>
+    <component base="macronbelowcomb" xOffset="81"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
index db329a71..0e1520e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1197"/>
+  <advance width="1181"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="733"/>
+    <component base="zcaron" xOffset="717"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
index d828d477..835c9806 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
index e4ea2b76..1e3aecf1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="245"/>
+    <component base="acutecomb.case" xOffset="237"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
index 57eddbd9..315224d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="brevecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
index 39b00011..4cd36df9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="149"/>
+    <component base="caroncomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
index 3ed8e667..7e56c2f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="166"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="cedillacomb" xOffset="158"/>
+    <component base="brevecomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
index e1edec2d..b549a184 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="145"/>
+    <component base="circumflexcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
index 8257fb9a..c409413e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="193" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
index d3f96410..7e818404 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="177"/>
-    <component base="circumflexcomb.case" xOffset="145"/>
+    <component base="dotbelowcomb" xOffset="169"/>
+    <component base="circumflexcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
index 4773ec6b..5c749e33 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="193" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
index 5631b1fa..72bcc4cd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="167" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="193" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
index 537282ad..b6d99469 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="134" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="160" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
index 28382070..e833a285 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="112"/>
+    <component base="dblgravecomb.case" xOffset="104"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
index ec34832e..6b4080f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="97"/>
+    <component base="dieresiscomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
index 1e09985b..16e8086f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="197"/>
+    <component base="dotaccentcomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
index 39dde9e0..15a76f8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="177"/>
+    <component base="dotbelowcomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
index 0efbd1a4..12b255ba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
index 55266049..0a3a3492 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="189"/>
+    <component base="hookabovecomb.case" xOffset="181"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
index 90e90000..10f7347f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="136"/>
+    <component base="breveinvertedcomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
index e7a0a0a4..5a192ffd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Regular.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="883"/>
+  <advance width="867"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
index 73112e43..862ae538 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
+    <component base="macroncomb.case" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
index 0876e4b4..f57d957d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
-    <component base="acutecomb.case" xOffset="245" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="83"/>
+    <component base="acutecomb.case" xOffset="237" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
index fa8c132c..f0ea39d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="91"/>
-    <component base="gravecomb.case" xOffset="138" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="83"/>
+    <component base="gravecomb.case" xOffset="130" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
index 380f0626..f05d4273 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Regular.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="745"/>
+  <advance width="729"/>
   <unicode hex="041D"/>
   <anchor x="672" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
index 4a44b4b9..989bdc42 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0118"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="86"/>
+    <component base="ogonekcomb" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
index 2eee313c..13eb601e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="618"/>
+  <advance width="602"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
index d1f8d40b..ce9e21b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="0421"/>
   <anchor x="380" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
index 1f988a9e..fd868e08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="653"/>
+  <advance width="645"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_th.glif b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
index e8032e26..18758351 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="733"/>
+  <advance width="717"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-57" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="-65" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
index 397033e7..0155b898 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="93"/>
+    <component base="tildecomb.case" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
index 82f28af6..3d1579f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Regular.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="782"/>
+  <advance width="764"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
index 600e3877..3c5225ed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="194"/>
+    <component base="brevecomb.case" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
index 6ae06373..6183a5c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="219"/>
+    <component base="caroncomb.case" xOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
index 63350ccf..89b266c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="215"/>
+    <component base="circumflexcomb.case" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
index 4cb91a70..c09309ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="237"/>
+    <component base="commaaccentcomb" xOffset="229"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
index 9ddd3339..13ecfd97 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="267"/>
+    <component base="dotaccentcomb.case" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif 
b/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
index 55b4085c..71ced801 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_ermandbls.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Germandbls" format="2">
-  <advance width="716"/>
+  <advance width="699"/>
   <unicode hex="1E9E"/>
   <outline>
     <contour>
-      <point x="447" y="-10" type="curve" smooth="yes"/>
-      <point x="576" y="-10"/>
-      <point x="662" y="66"/>
-      <point x="662" y="181" type="curve" smooth="yes"/>
-      <point x="662" y="283"/>
-      <point x="594" y="364"/>
-      <point x="466" y="388" type="curve"/>
-      <point x="476" y="352" type="line"/>
-      <point x="612" y="583" type="line"/>
-      <point x="579" y="657"/>
-      <point x="483" y="704"/>
-      <point x="366" y="704" type="curve" smooth="yes"/>
-      <point x="201" y="704"/>
-      <point x="93" y="610"/>
-      <point x="93" y="468" type="curve" smooth="yes"/>
-      <point x="93" y="0" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="176" y="468" type="line" smooth="yes"/>
-      <point x="176" y="566"/>
-      <point x="246" y="631"/>
-      <point x="361" y="631" type="curve" smooth="yes"/>
-      <point x="434" y="631"/>
-      <point x="495" y="605"/>
-      <point x="518" y="565" type="curve"/>
-      <point x="383" y="332" type="line"/>
-      <point x="508" y="312"/>
-      <point x="577" y="255"/>
-      <point x="577" y="171" type="curve" smooth="yes"/>
-      <point x="577" y="102"/>
-      <point x="531" y="63"/>
-      <point x="452" y="63" type="curve" smooth="yes"/>
-      <point x="410" y="63"/>
-      <point x="357" y="74"/>
-      <point x="317" y="91" type="curve"/>
-      <point x="292" y="26" type="line"/>
-      <point x="336" y="3"/>
-      <point x="392" y="-10"/>
+      <point x="439" y="-10" type="curve" smooth="yes"/>
+      <point x="568" y="-10"/>
+      <point x="654" y="66"/>
+      <point x="654" y="181" type="curve" smooth="yes"/>
+      <point x="654" y="283"/>
+      <point x="586" y="364"/>
+      <point x="458" y="388" type="curve"/>
+      <point x="468" y="352" type="line"/>
+      <point x="604" y="583" type="line"/>
+      <point x="571" y="657"/>
+      <point x="475" y="704"/>
+      <point x="358" y="704" type="curve" smooth="yes"/>
+      <point x="193" y="704"/>
+      <point x="85" y="610"/>
+      <point x="85" y="468" type="curve" smooth="yes"/>
+      <point x="85" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="168" y="468" type="line" smooth="yes"/>
+      <point x="168" y="566"/>
+      <point x="238" y="631"/>
+      <point x="353" y="631" type="curve" smooth="yes"/>
+      <point x="426" y="631"/>
+      <point x="487" y="605"/>
+      <point x="510" y="565" type="curve"/>
+      <point x="375" y="332" type="line"/>
+      <point x="500" y="312"/>
+      <point x="569" y="255"/>
+      <point x="569" y="171" type="curve" smooth="yes"/>
+      <point x="569" y="102"/>
+      <point x="523" y="63"/>
+      <point x="444" y="63" type="curve" smooth="yes"/>
+      <point x="402" y="63"/>
+      <point x="349" y="74"/>
+      <point x="309" y="91" type="curve"/>
+      <point x="284" y="26" type="line"/>
+      <point x="328" y="3"/>
+      <point x="384" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
index 5fbe89b2..1961e11b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="739"/>
+  <advance width="722"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="161"/>
+    <component base="macroncomb.case" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
index 6f9236b1..ced85276 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="633"/>
+  <advance width="643"/>
   <unicode hex="0425"/>
   <anchor x="584" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
index 09848176..7739f756 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="745"/>
+  <advance width="729"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-72" yOffset="197"/>
+    <component base="strokelongcomb" xOffset="-80" yOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
index ce1a159a..bc816827 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="745"/>
+  <advance width="729"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="167"/>
+    <component base="brevebelowcomb" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
index 6a5394f2..abb672c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="745"/>
+  <advance width="729"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="185"/>
+    <component base="circumflexcomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
index 29d46e8f..8e4170f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="745"/>
+  <advance width="729"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="237"/>
+    <component base="dotbelowcomb" xOffset="229"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
index 1a16e845..b16fca96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
index d84d93d7..d4733c16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="58"/>
+    <component base="acutecomb.case" xOffset="50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
index f77e4056..ec2a126b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-63"/>
+    <component base="brevecomb.case" xOffset="-71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
index 4c9176b5..7ec75856 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-38"/>
+    <component base="caroncomb.case" xOffset="-46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
index 387b0ca1..dd43ea31 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-42"/>
+    <component base="circumflexcomb.case" xOffset="-50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
index 5933627b..1c665fa5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-75"/>
+    <component base="dblgravecomb.case" xOffset="-83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
index 1e28da74..da8a780d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
+    <component base="dieresiscomb.case" xOffset="-98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
index c9098159..c82970ac 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
-    <component base="acutecomb.case" xOffset="58" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="-98"/>
+    <component base="acutecomb.case" xOffset="50" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
index e761e2df..4b7f22c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="10"/>
+    <component base="dotaccentcomb.case" xOffset="2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
index 77ed70a8..c0894b48 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="10"/>
+    <component base="dotbelowcomb" xOffset="2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
index 6bf48a43..0d803ed8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0415"/>
   <anchor x="303" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
index 746fd147..6db7b418 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
index c755a11c..1f296154 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
index adf1b57b..6b5a7e15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-49"/>
+    <component base="gravecomb.case" xOffset="-57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
index 818d53d9..198a60e5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="2"/>
+    <component base="hookabovecomb.case" xOffset="-6"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
index 29dc435b..ae195abd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-51"/>
+    <component base="breveinvertedcomb.case" xOffset="-59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
index 5dbc2793..3aa9e163 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-68"/>
+    <component base="macroncomb.narrow.case" xOffset="-76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
index 5d694f67..283e29d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="600"/>
+  <advance width="584"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
index 4dad5f88..5cacb3c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-244"/>
+    <component base="ogonekcomb.narrow" xOffset="-252"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
index 5a1919a5..6208f5b7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-94"/>
+    <component base="tildecomb.case" xOffset="-102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
index 55938235..27aa937e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_acute.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jacute" format="2">
-  <advance width="443"/>
+  <advance width="407"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="215"/>
+    <component base="acutecomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
index 3b828b05..dd88649a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Jcircumflex" format="2">
-  <advance width="443"/>
+  <advance width="407"/>
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="115"/>
+    <component base="circumflexcomb.case" xOffset="87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
index d9db3b5d..c2f6a246 100644
--- a/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/J_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Je-cy" format="2">
-  <advance width="443"/>
+  <advance width="407"/>
   <unicode hex="0408"/>
   <outline>
     <component base="J"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
index 162d4d6e..df16babb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="627"/>
+  <advance width="622"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="230"/>
+    <component base="acutecomb.case" xOffset="226"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
index c3043ef2..a0b7ddb4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="627"/>
+  <advance width="622"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="152"/>
+    <component base="commaaccentcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
index d9882817..cbbf4412 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="980"/>
+  <advance width="922"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="537"/>
+    <component base="J" xOffset="515"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
index f15ac952..41739fca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="59"/>
+    <component base="acutecomb.case" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
index 5e23bc99..2d827602 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="185"/>
+    <component base="caroncomb.alt" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
index 224732b1..c281c5d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="136"/>
+    <component base="commaaccentcomb" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
index fd8768de..e13b3744 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="516"/>
+  <advance width="515"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="543"/>
+    <component base="periodcentered.loclCAT.case" xOffset="535"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
index c574a3ee..e8e385b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="166"/>
+    <component base="dotbelowcomb" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_j.glif b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
index 2f048ea8..099406d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="792"/>
+  <advance width="770"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="537"/>
+    <component base="j" xOffset="515"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
index 8c6d7d11..419438ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="57"/>
+    <component base="macronbelowcomb" xOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
index f19a4669..bf989786 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="537"/>
+  <advance width="515"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-9" yOffset="65"/>
+    <component base="slashshortcomb.case" xOffset="-17" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
index b13cb696..fb6db497 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="883"/>
+  <advance width="867"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="306"/>
+    <component base="dotbelowcomb" xOffset="298"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
index aec875d6..9c9d32bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1217"/>
+  <advance width="1165"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="774"/>
+    <component base="J" xOffset="758"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
index 33e47d36..b10e07d2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="299"/>
+    <component base="acutecomb.case" xOffset="291"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
index 272d2ead..2c8515c3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="203"/>
+    <component base="caroncomb.case" xOffset="195"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
index fb77a16d..b611a6fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="221"/>
+    <component base="commaaccentcomb" xOffset="213"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
index 74dbd488..9d4cf866 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="251"/>
+    <component base="dotaccentcomb.case" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
index 71a6cd50..628cdaf3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="dotbelowcomb" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_j.glif b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
index 9f22173b..db362ff8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1029"/>
+  <advance width="1013"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="774"/>
+    <component base="j" xOffset="758"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
index 848e6094..33a9f3ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="142"/>
+    <component base="macronbelowcomb" xOffset="134"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
index cad4495c..de5974b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="774"/>
+  <advance width="758"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="147"/>
+    <component base="tildecomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
index 8e6116ea..ea972eae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="041E"/>
   <anchor x="394" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
index 718eb4d1..20ab7503 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
index 424f5a37..385b4f7d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Regular.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="782"/>
+  <advance width="764"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-54" yOffset="5"/>
+    <component base="_bar-cy" xOffset="-63" yOffset="5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
index 16e10a34..f3bd0e1a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="182"/>
+    <component base="brevecomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
index 9e9da0df..c575c10f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="207"/>
+    <component base="caroncomb.case" xOffset="198"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
index 4b6ea36c..5f8feed3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="203"/>
+    <component base="circumflexcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
index a004cd92..05bab67f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="250" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
index 13b1c3b4..812506d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="255"/>
-    <component base="circumflexcomb.case" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="circumflexcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
index b90c278c..f8516f58 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="250" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
index 5e66d217..9a1962c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="225" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="250" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
index db904b2f..3a4252f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="192" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="217" yOffset="12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
index 64c830a9..2079a36b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="170"/>
+    <component base="dblgravecomb.case" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
index fe9a5e5a..f07ebc34 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Regular.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="782"/>
+  <advance width="764"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
index 5a3c1807..4d4ff1bb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="155"/>
+    <component base="dieresiscomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
index 0023d90c..754b52b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="155"/>
-    <component base="macroncomb.case" xOffset="149" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="146"/>
+    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
index 2a22d8b0..d8a5b292 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="255"/>
-    <component base="macroncomb.case" xOffset="149" yOffset="162"/>
+    <component base="dotaccentcomb.case" xOffset="246"/>
+    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
index 0c0a955c..b6181be3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="255"/>
+    <component base="dotbelowcomb" xOffset="246"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
index b5584573..a7204a42 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="196"/>
+    <component base="gravecomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
index 21366be5..95882c1c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="247"/>
+    <component base="hookabovecomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
index afb594f0..d3b0661f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="829"/>
+  <advance width="764"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="564" yOffset="212"/>
+    <component base="horncomb" xOffset="555" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
index fff1bfef..25dcfcb8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="839"/>
+  <advance width="764"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
index 11f96b3f..1f33c2be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="839"/>
+  <advance width="764"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="255"/>
+    <component base="dotbelowcomb" xOffset="246"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
index 9ae595c3..e8054223 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="839"/>
+  <advance width="764"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="196"/>
+    <component base="gravecomb.case" xOffset="187"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
index d8f4d6c5..10f41af4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="839"/>
+  <advance width="764"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="247"/>
+    <component base="hookabovecomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
index be621635..4bd4cd11 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="839"/>
+  <advance width="764"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
index d7d619e0..eebe0eda 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="181"/>
+    <component base="hungarumlautcomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
index e866dc89..e5190a36 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="194"/>
+    <component base="breveinvertedcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
index 2a7ec8c5..782457f2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
+    <component base="macroncomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
index 8d8bc9c7..6b6e9962 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
-    <component base="acutecomb.case" xOffset="303" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="140"/>
+    <component base="acutecomb.case" xOffset="294" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
index 80863b6a..2e2e7933 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="149"/>
-    <component base="gravecomb.case" xOffset="196" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="140"/>
+    <component base="gravecomb.case" xOffset="187" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
index 1c6ffaba..f5986c8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="40"/>
+    <component base="ogonekcomb.tall.case" xOffset="31"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
index 5be56b05..4cfc1a34 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="121" yOffset="-2"/>
+    <component base="slashlongcomb.case" xOffset="112" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
index e361a62a..b7ed96b1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="303"/>
+    <component base="acutecomb.case" xOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
index c8427ad7..217f533a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
index 2b9c88e0..e651e850 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="acutecomb.case" xOffset="304" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="142"/>
+    <component base="acutecomb.case" xOffset="295" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
index 993e4713..56ba098b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="dieresiscomb.case" xOffset="156" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="142"/>
+    <component base="dieresiscomb.case" xOffset="147" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
index da9570b9..0cf48962 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="782"/>
+  <advance width="764"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="macroncomb.case" xOffset="150" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="142"/>
+    <component base="macroncomb.case" xOffset="141" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
index c0ba7298..e05d5150 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Regular.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="291"/>
+  <advance width="275"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
index 921d4cbe..b5fe9c76 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="795"/>
+  <advance width="779"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
index 2f574794..7fd6b19c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="233"/>
+    <component base="acutecomb.case" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
index 66bbd51e..16e9976f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="137"/>
+    <component base="caroncomb.case" xOffset="129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
index 3970711b..cd7c6099 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="155"/>
+    <component base="commaaccentcomb" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
index 47c8f762..3d963115 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="100"/>
+    <component base="dblgravecomb.case" xOffset="92"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
index e6dafd6d..7c3f7ce1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="185"/>
+    <component base="dotbelowcomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
index 379a6347..d344b39a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="124"/>
+    <component base="breveinvertedcomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
index d679203e..3bff79ca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="645"/>
+  <advance width="633"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="76"/>
+    <component base="macronbelowcomb" xOffset="68"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
index 95b45e65..47976fd7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="202"/>
+    <component base="acutecomb.case" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
index 6167e8d9..e2e27301 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="202"/>
-    <component base="dotaccentcomb.case" xOffset="105" yOffset="107"/>
+    <component base="acutecomb.case" xOffset="197"/>
+    <component base="dotaccentcomb.case" xOffset="100" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
index b59e6f99..c9e96a29 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="106"/>
+    <component base="caroncomb.case" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
index 18733c5f..e14c32f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="106"/>
-    <component base="dotaccentcomb.case" xOffset="154" yOffset="142"/>
+    <component base="caroncomb.case" xOffset="101"/>
+    <component base="dotaccentcomb.case" xOffset="149" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
index 8a625ffd..c876d6d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="143"/>
+    <component base="cedillacomb" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
index 9c086472..f2b525c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_chwa-cy.glif
+++ b/src/Cantarell-Regular.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="744"/>
+  <advance width="726"/>
   <unicode hex="04D8"/>
   <outline>
     <component base="Schwa"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
index d502fdf2..d7b074ba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Schwa" format="2">
-  <advance width="744"/>
+  <advance width="726"/>
   <unicode hex="018F"/>
-  <anchor x="369" y="0" name="bottom"/>
-  <anchor x="369" y="694" name="top"/>
+  <anchor x="360" y="0" name="bottom"/>
+  <anchor x="360" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="322" y="700" type="curve" smooth="yes"/>
-      <point x="235" y="700"/>
-      <point x="157" y="680"/>
-      <point x="87" y="640" type="curve"/>
-      <point x="106" y="579" type="line"/>
-      <point x="170" y="610"/>
-      <point x="240" y="627"/>
-      <point x="308" y="627" type="curve" smooth="yes"/>
-      <point x="486" y="627"/>
-      <point x="594" y="521"/>
-      <point x="594" y="329" type="curve" smooth="yes"/>
-      <point x="594" y="158"/>
-      <point x="509" y="63"/>
-      <point x="362" y="63" type="curve" smooth="yes"/>
-      <point x="222" y="63"/>
-      <point x="140" y="148"/>
-      <point x="140" y="300" type="curve"/>
-      <point x="615" y="300" type="line"/>
-      <point x="615" y="368" type="line"/>
-      <point x="67" y="368" type="line"/>
-      <point x="65" y="345"/>
-      <point x="63" y="312"/>
-      <point x="63" y="291" type="curve" smooth="yes"/>
-      <point x="63" y="111"/>
-      <point x="179" y="-10"/>
-      <point x="355" y="-10" type="curve" smooth="yes"/>
-      <point x="546" y="-10"/>
-      <point x="679" y="132"/>
-      <point x="679" y="347" type="curve" smooth="yes"/>
-      <point x="679" y="566"/>
-      <point x="541" y="700"/>
+      <point x="313" y="700" type="curve" smooth="yes"/>
+      <point x="226" y="700"/>
+      <point x="148" y="680"/>
+      <point x="78" y="640" type="curve"/>
+      <point x="97" y="579" type="line"/>
+      <point x="161" y="610"/>
+      <point x="231" y="627"/>
+      <point x="299" y="627" type="curve" smooth="yes"/>
+      <point x="477" y="627"/>
+      <point x="585" y="521"/>
+      <point x="585" y="329" type="curve" smooth="yes"/>
+      <point x="585" y="158"/>
+      <point x="500" y="63"/>
+      <point x="353" y="63" type="curve" smooth="yes"/>
+      <point x="213" y="63"/>
+      <point x="131" y="148"/>
+      <point x="131" y="300" type="curve"/>
+      <point x="606" y="300" type="line"/>
+      <point x="606" y="368" type="line"/>
+      <point x="58" y="368" type="line"/>
+      <point x="56" y="345"/>
+      <point x="54" y="312"/>
+      <point x="54" y="291" type="curve" smooth="yes"/>
+      <point x="54" y="111"/>
+      <point x="170" y="-10"/>
+      <point x="346" y="-10" type="curve" smooth="yes"/>
+      <point x="537" y="-10"/>
+      <point x="670" y="132"/>
+      <point x="670" y="347" type="curve" smooth="yes"/>
+      <point x="670" y="566"/>
+      <point x="532" y="700"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
index bc16b923..72fcb712 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="102"/>
+    <component base="circumflexcomb.case" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
index 2119d59a..716f5718 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="124"/>
+    <component base="commaaccentcomb" xOffset="119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
index 0af030bd..bb1d07d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="154"/>
+    <component base="dotaccentcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
index da1206ef..dbf444be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
index 3434d6f2..13bc5a50 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="586"/>
+  <advance width="577"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="154"/>
-    <component base="dotaccentcomb.case" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="149"/>
+    <component base="dotaccentcomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
index d5c5ecdc..caf2d2e0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="69" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="65" yOffset="49"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
index 0beff189..c0f25735 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="113"/>
+    <component base="caroncomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
index 7f80a0d7..9c16dcc3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="150"/>
+    <component base="cedillacomb" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
index 98e12121..5360c771 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="131"/>
+    <component base="commaaccentcomb" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
index 5ff1372b..475361ed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="161"/>
+    <component base="dotbelowcomb" xOffset="157"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
index f25d4d19..bd7ad390 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="0422"/>
   <anchor x="614" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
index c103381e..dd696b3d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="594"/>
+  <advance width="586"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="52"/>
+    <component base="macronbelowcomb" xOffset="48"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
index 9903567d..ea41ca6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="267"/>
+    <component base="acutecomb.case" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
index ee3c62c5..61c28754 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="146"/>
+    <component base="brevecomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
index f281882f..3f57b6c2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="171"/>
+    <component base="caroncomb.case" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
index d5f05ce4..5372fec4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="167"/>
+    <component base="circumflexcomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
index 42b4953f..fab8c35f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="134"/>
+    <component base="dblgravecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
index a55a2664..bf4b557e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
+    <component base="dieresiscomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
index 50c83b4a..647653ea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="acutecomb.case" xOffset="267" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="acutecomb.case" xOffset="259" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
index e19a7e31..e30dd5e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="caroncomb.case" xOffset="171" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="caroncomb.case" xOffset="163" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
index 1078b692..787ff150 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="gravecomb.case" xOffset="160" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="gravecomb.case" xOffset="152" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
index c38a4ca3..411c00a1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="119"/>
-    <component base="macroncomb.case" xOffset="113" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="111"/>
+    <component base="macroncomb.case" xOffset="105" yOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
index 8a3f3585..869817d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="219"/>
+    <component base="dotbelowcomb" xOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
index 50694fb2..b4507b73 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="160"/>
+    <component base="gravecomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
index 5c0034e2..b3cb191f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="211"/>
+    <component base="hookabovecomb.case" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
index 3220eb02..fc4a353c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horn.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="806"/>
+  <advance width="694"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
index 8454d0bd..de6d90bc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="826"/>
+  <advance width="694"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="267"/>
+    <component base="acutecomb.case" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
index 9edd2bbe..c240cd4d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="826"/>
+  <advance width="694"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="219"/>
+    <component base="dotbelowcomb" xOffset="211"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
index f164a9bc..e2716e65 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="826"/>
+  <advance width="694"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="160"/>
+    <component base="gravecomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
index 48a13b06..be8dff6d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="826"/>
+  <advance width="694"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="211"/>
+    <component base="hookabovecomb.case" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
index 9218aa40..546f4cd4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="826"/>
+  <advance width="694"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="115"/>
+    <component base="tildecomb.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
index 475579a7..556de310 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="145"/>
+    <component base="hungarumlautcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
index c5b750f2..ded5ed9c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="158"/>
+    <component base="breveinvertedcomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
index f689de81..8c9933b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="113"/>
+    <component base="macroncomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
index fd38c39f..e92e33be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="113"/>
-    <component base="dieresiscomb.case" xOffset="119" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="105"/>
+    <component base="dieresiscomb.case" xOffset="111" yOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
index d7f453cf..7a471f99 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="17"/>
+    <component base="ogonekcomb.tall.case" xOffset="9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
index 0f8692ab..fefd6c0c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="182"/>
+    <component base="ringcomb.case" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
index c9b30995..0da39366 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="04AE"/>
   <anchor x="310" y="271" name="center"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
index 7cad688b..292c1f23 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
index 79181b0c..18cb25d3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="115"/>
+    <component base="tildecomb.case" xOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
index cf66f35d..1440e7e3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="711"/>
+  <advance width="694"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="115"/>
-    <component base="acutecomb.case" xOffset="268" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="107"/>
+    <component base="acutecomb.case" xOffset="260" yOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
index a7528f87..c4482295 100644
--- a/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="656"/>
+  <advance width="640"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
index 5de34bed..f739e0b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="221"/>
+    <component base="acutecomb.case" xOffset="217"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
index b3f21cb9..99ba6b00 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="121"/>
+    <component base="circumflexcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
index b20c743e..d76b7d39 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="73"/>
+    <component base="dieresiscomb.case" xOffset="69"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
index a0d76907..7cdb7722 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="173"/>
+    <component base="dotaccentcomb.case" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
index 4a6442d1..8d91e821 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="173"/>
+    <component base="dotbelowcomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
index dd21742c..2170491f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="114"/>
+    <component base="gravecomb.case" xOffset="110"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
index 61f0d4b1..c5da57b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="165"/>
+    <component base="hookabovecomb.case" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
index fd1d7573..268238a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Regular.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="291"/>
+  <advance width="275"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-90"/>
+    <component base="dieresiscomb.case" xOffset="-98"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
index fd710dd3..8bbda1ed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="67"/>
+    <component base="macroncomb.case" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
index 0160dc82..fee72a07 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="606"/>
+  <advance width="598"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="69"/>
+    <component base="tildecomb.case" xOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
index 4067d07b..0ee2ba9f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="654"/>
+  <advance width="638"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="239"/>
+    <component base="acutecomb.case" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
index 26c9bb3f..4d6fcc16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="654"/>
+  <advance width="638"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="143"/>
+    <component base="caroncomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
index a3352181..92a8d900 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="654"/>
+  <advance width="638"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="191"/>
+    <component base="dotaccentcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
index d768c671..c531fc2f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="654"/>
+  <advance width="638"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="dotbelowcomb" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/acutecomb_dotaccentcomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/acutecomb_dotaccentcomb.glif
index 4abcec85..2f2788d0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/acutecomb_dotaccentcomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/acutecomb_dotaccentcomb.glif
@@ -2,7 +2,7 @@
 <glyph name="acutecomb_dotaccentcomb" format="2">
   <outline>
     <component base="acutecomb.loclVIET"/>
-    <component base="dotaccentcomb.loclVIET" xOffset="-92" yOffset="145"/>
+    <component base="dotaccentcomb.loclVIET" xOffset="-16" yOffset="180"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cacute.glif b/src/Cantarell-Regular.ufo/glyphs/cacute.glif
index e3dfe7e2..3c19546a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cacute" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0107"/>
   <outline>
     <component base="c"/>
-    <component base="acutecomb" xOffset="184"/>
+    <component base="acutecomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccaron.glif b/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
index 5281d2f5..4bec6d0d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccaron" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="010D"/>
   <outline>
     <component base="c"/>
-    <component base="caroncomb" xOffset="84"/>
+    <component base="caroncomb" xOffset="85"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif b/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
index 05dcd3f6..257c5ee7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedilla" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="00E7"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
+    <component base="cedillacomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
index 947aeac9..d5ec8edb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccedillaacute" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="1E09"/>
   <outline>
     <component base="c"/>
-    <component base="cedillacomb" xOffset="100"/>
-    <component base="acutecomb" xOffset="184"/>
+    <component base="cedillacomb" xOffset="101"/>
+    <component base="acutecomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
index cf720c62..6f4d174e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ccircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ccircumflex" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0109"/>
   <outline>
     <component base="c"/>
-    <component base="circumflexcomb" xOffset="74"/>
+    <component base="circumflexcomb" xOffset="75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
index 0eb90b06..65d9c2a5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cdotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cdotaccent" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="010B"/>
   <outline>
     <component base="c"/>
-    <component base="dotaccentcomb" xOffset="134"/>
+    <component base="dotaccentcomb" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.case.glif
index fd6c2702..b7524da4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_acutecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-59" yOffset="200"/>
-    <component base="acutecomb.loclVIET" yxScale="0.06993" xOffset="220" yOffset="303"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-59" yOffset="200"/>
+    <component base="acutecomb.loclVIET" xOffset="179" yOffset="281"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>520</integer>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.glif
index a2aeae77..eb4e39af 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_acutecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>acutecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>386</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.case.glif
index bea2b735..4d9aefb4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_gravecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-59" yOffset="200"/>
-    <component base="gravecomb.loclVIET" yxScale="0.06993" xOffset="123" yOffset="303"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-59" yOffset="200"/>
+    <component base="gravecomb.loclVIET" xOffset="92" yOffset="281"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>421</integer>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.glif
index 8117a3ac..9e64fa04 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_gravecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>gravecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>386</integer>
       <key>com.schriftgestaltung.componentsAlignment</key>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
index 521fe23c..cfef1206 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.case.glif
@@ -1,11 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_hookabovecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-59" yOffset="200"/>
-    <component base="hookabovecomb.loclVIET" yxScale="0.06993" xOffset="150" yOffset="303"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-59" yOffset="200"/>
+    <component base="hookabovecomb.loclVIET" xOffset="128" yOffset="281"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>487</integer>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.glif
index 454b3694..789ae651 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_hookabovecomb.glif
@@ -6,6 +6,17 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.ComponentInfo</key>
+      <array>
+        <dict>
+          <key>anchor</key>
+          <string>top_viet</string>
+          <key>index</key>
+          <integer>1</integer>
+          <key>name</key>
+          <string>hookabovecomb.loclVIET</string>
+        </dict>
+      </array>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>441</integer>
     </dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_tildecomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_tildecomb.case.glif
index b8f9a40a..0b3d13c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_tildecomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb_tildecomb.case.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="circumflexcomb_tildecomb.case" format="2">
   <outline>
-    <component base="circumflexcomb.loclVIET" yxScale="0.06993" xOffset="-26" yOffset="200"/>
-    <component base="tildecomb.loclVIET" yxScale="0.06993" xOffset="-54" yOffset="351"/>
+    <component base="circumflexcomb.loclVIET" xOffset="-26" yOffset="200"/>
+    <component base="tildecomb.loclVIET" xOffset="-56" yOffset="298"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/es-cy.glif b/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
index 74d6d5be..b29ac8fe 100644
--- a/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/es-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="es-cy" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="0441"/>
   <anchor x="266" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
index e9d390b3..f54f2ee8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/esdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="esdescender-cy" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="04AB"/>
   <outline>
     <component base="es-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif b/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
index 77240095..102ddf21 100644
--- a/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/fita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="fita-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0473"/>
   <outline>
     <component base="obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
index 0f90cc05..644f725b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="o-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="043E"/>
   <anchor x="285" y="482" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oacute.glif b/src/Cantarell-Regular.ufo/glyphs/oacute.glif
index d17687ab..522491c7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F3"/>
   <outline>
     <component base="o"/>
-    <component base="acutecomb" xOffset="200"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
index 29cc0b7e..8e847772 100644
--- a/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/obarred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obarred-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="04E9"/>
   <outline>
     <component base="o"/>
-    <component base="strokeshortcomb" xScale="1.33574" xOffset="-22" yOffset="-57"/>
+    <component base="strokeshortcomb" xScale="1.33574" xOffset="-21" yOffset="-57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/obreve.glif b/src/Cantarell-Regular.ufo/glyphs/obreve.glif
index 5a431270..f3b18b9f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/obreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/obreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="obreve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="014F"/>
   <outline>
     <component base="o"/>
-    <component base="brevecomb" xOffset="75"/>
+    <component base="brevecomb" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocaron.glif b/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
index 7b1e8856..7b1c9e14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocaron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="01D2"/>
   <outline>
     <component base="o"/>
-    <component base="caroncomb" xOffset="100"/>
+    <component base="caroncomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
index fa37acb6..f0d05b49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflex" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F4"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb" xOffset="90"/>
+    <component base="circumflexcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
index 8d58745c..2364b414 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED1"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_acutecomb" xOffset="92"/>
+    <component base="circumflexcomb_acutecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
index 90def9b0..665c3729 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexdotbelow" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED9"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="147"/>
-    <component base="circumflexcomb" xOffset="90"/>
+    <component base="dotbelowcomb" xOffset="148"/>
+    <component base="circumflexcomb" xOffset="91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
index cc91fa6c..ccb9cf7b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexgrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED3"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_gravecomb" xOffset="92"/>
+    <component base="circumflexcomb_gravecomb" xOffset="93"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
index ba31f31d..6371c8ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflexhookabove" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED5"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_hookabovecomb" xOffset="115"/>
+    <component base="circumflexcomb_hookabovecomb" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
index 6e7f6b6a..b3c42046 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ocircumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ocircumflextilde" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ED7"/>
   <outline>
     <component base="o"/>
-    <component base="circumflexcomb_tildecomb" xOffset="70"/>
+    <component base="circumflexcomb_tildecomb" xOffset="71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif b/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
index 484d7751..4321083d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odblgrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="020D"/>
   <outline>
     <component base="o"/>
-    <component base="dblgravecomb" xOffset="29"/>
+    <component base="dblgravecomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
index 70ef562f..cb8a303d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis-cy" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="04E7"/>
   <outline>
     <component base="o-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresis.glif b/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
index f471c371..a4736e62 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresis" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F6"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb" xOffset="50"/>
+    <component base="dieresiscomb" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
index dc7b92c9..b7d0a3ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odieresismacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odieresismacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="022B"/>
   <outline>
     <component base="o"/>
-    <component base="dieresiscomb_macroncomb" xOffset="59"/>
+    <component base="dieresiscomb_macroncomb" xOffset="60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
index d965a5cf..1eebcac4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odotaccentmacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotaccentmacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0231"/>
   <outline>
     <component base="o"/>
-    <component base="dotaccentcomb_macroncomb" xOffset="-2"/>
+    <component base="dotaccentcomb_macroncomb" xOffset="-1"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif b/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
index f90d10c2..d786f0fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/odotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="odotbelow" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ECD"/>
   <outline>
     <component base="o"/>
-    <component base="dotbelowcomb" xOffset="147"/>
+    <component base="dotbelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ograve.glif b/src/Cantarell-Regular.ufo/glyphs/ograve.glif
index 2d4758ba..63f6543d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ograve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ograve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ograve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F2"/>
   <outline>
     <component base="o"/>
-    <component base="gravecomb" xOffset="105"/>
+    <component base="gravecomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
index 0477ce24..d06ad7ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohookabove" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1ECF"/>
   <outline>
     <component base="o"/>
-    <component base="hookabovecomb" xOffset="130"/>
+    <component base="hookabovecomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorn.glif b/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
index ae9b9237..34725ea1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorn" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="01A1"/>
   <outline>
     <component base="o"/>
-    <component base="horncomb" xOffset="365"/>
+    <component base="horncomb" xOffset="366"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
index af9be988..bc1dee95 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornacute" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDB"/>
   <outline>
     <component base="ohorn"/>
-    <component base="acutecomb" xOffset="200"/>
+    <component base="acutecomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
index 436fbb7b..8407f67a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorndotbelow" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EE3"/>
   <outline>
     <component base="ohorn"/>
-    <component base="dotbelowcomb" xOffset="147"/>
+    <component base="dotbelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
index 030912c4..495cdb16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorngrave" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDD"/>
   <outline>
     <component base="ohorn"/>
-    <component base="gravecomb" xOffset="105"/>
+    <component base="gravecomb" xOffset="106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
index 025ed018..32b66b19 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohornhookabove" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EDF"/>
   <outline>
     <component base="ohorn"/>
-    <component base="hookabovecomb" xOffset="130"/>
+    <component base="hookabovecomb" xOffset="131"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
index bcef1f72..e7d78ebf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohorntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohorntilde" format="2">
-  <advance width="625"/>
+  <advance width="627"/>
   <unicode hex="1EE1"/>
   <outline>
     <component base="ohorn"/>
-    <component base="tildecomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
index dd2b4261..c12eb04d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ohungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ohungarumlaut" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="0151"/>
   <outline>
     <component base="o"/>
-    <component base="hungarumlautcomb" xOffset="95"/>
+    <component base="hungarumlautcomb" xOffset="96"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
index 33555537..0ad80353 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oinvertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oinvertedbreve" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="020F"/>
   <outline>
     <component base="o"/>
-    <component base="breveinvertedcomb" xOffset="73"/>
+    <component base="breveinvertedcomb" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacron.glif b/src/Cantarell-Regular.ufo/glyphs/omacron.glif
index 714465f8..63911fd4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="014D"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb" xOffset="38"/>
+    <component base="macroncomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
index 6daf59f7..93b72c28 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacronacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacronacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E53"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_acutecomb" xOffset="38"/>
+    <component base="macroncomb_acutecomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
index ffe6d9ea..61c72a14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omacrongrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omacrongrave" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E51"/>
   <outline>
     <component base="o"/>
-    <component base="macroncomb_gravecomb" xOffset="38"/>
+    <component base="macroncomb_gravecomb" xOffset="39"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oogonek.glif b/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
index ed2e46da..06fa61b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oogonek" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="01EB"/>
   <outline>
     <component base="o"/>
-    <component base="ogonekcomb.tall" xOffset="-64" yOffset="-1"/>
+    <component base="ogonekcomb.tall" xOffset="-63" yOffset="-1"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otilde.glif b/src/Cantarell-Regular.ufo/glyphs/otilde.glif
index 62eb86b8..2147bce6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otilde" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="00F5"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb" xOffset="51"/>
+    <component base="tildecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
index 6492e8ef..27448d7b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildeacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildeacute" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E4D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_acutecomb" xOffset="51"/>
+    <component base="tildecomb_acutecomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
index 76f48c7d..65e78318 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildedieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildedieresis" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="1E4F"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_dieresiscomb" xOffset="51"/>
+    <component base="tildecomb_dieresiscomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
index 8ec218f3..d6fdd798 100644
--- a/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/otildemacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="otildemacron" format="2">
-  <advance width="565"/>
+  <advance width="567"/>
   <unicode hex="022D"/>
   <outline>
     <component base="o"/>
-    <component base="tildecomb_macroncomb" xOffset="51"/>
+    <component base="tildecomb_macroncomb" xOffset="52"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
index 1d0fac51..e5155f06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="291"/>
+  <advance width="275"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/lib.plist b/src/Cantarell-Regular.ufo/lib.plist
index 58d80892..213ab1f3 100644
--- a/src/Cantarell-Regular.ufo/lib.plist
+++ b/src/Cantarell-Regular.ufo/lib.plist
@@ -1335,7 +1335,7 @@
       <string>{-217, -12}</string>
     </array>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesAutomaticAlignment</key>
-    <true/>
+    <false/>
     <key>com.schriftgestaltung.customParameter.GSFont.disablesLastChange</key>
     <true/>
     <key>com.schriftgestaltung.customParameter.GSFont.useNiceNames</key>


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