[cantarell-fonts/respacing] Update dependant glyphs



commit c763d9097e81796dbc688d18a7a94d2642c4b9fa
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Wed May 29 22:54:13 2019 +0200

    Update dependant glyphs

 src/Cantarell-Bold.ufo/glyphs/A_-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/A_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif    |  4 +-
 .../glyphs/A_brevehookabove.glif                   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_caron.glif         |  4 +-
 src/Cantarell-Bold.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-Bold.ufo/glyphs/A_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_ring.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_croat.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/D_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_ng.glif            | 46 +++++------
 src/Cantarell-Bold.ufo/glyphs/E_th.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/H_bar.glif           |  4 +-
 src/Cantarell-Bold.ufo/glyphs/H_brevebelow.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/I_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_J_.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_j.glif             |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/O_E_.glif            | 90 +++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/O_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_barred-cy.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_caron.glif         |  4 +-
 src/Cantarell-Bold.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-Bold.ufo/glyphs/O_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif      |  4 +-
 .../glyphs/O_dieresismacron.glif                   |  6 +-
 .../glyphs/O_dotaccentmacron.glif                  |  6 +-
 src/Cantarell-Bold.ufo/glyphs/O_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_horn.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/O_macrongrave.glif   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/O_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_slash.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_slashacute.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/O_tildedieresis.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/O_tildemacron.glif   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif     |  2 +-
 src/Cantarell-Light.ufo/glyphs/A_-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/A_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_breve.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_breveacute.glif   |  4 +-
 .../glyphs/A_brevedotbelow.glif                    |  6 +-
 src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif   |  4 +-
 .../glyphs/A_brevehookabove.glif                   |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_caron.glif        |  4 +-
 src/Cantarell-Light.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-Light.ufo/glyphs/A_dblgrave.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif  |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_dieresis.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_hookabove.glif    |  4 +-
 .../glyphs/A_invertedbreve.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_macron.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_ogonek.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_ring.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_ringacute.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/A_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif      |  4 +-
 src/Cantarell-Light.ufo/glyphs/D_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/D_croat.glif        |  2 +-
 src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/D_linebelow.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/D_zcaron.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/E_m-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_n-cy.glif         |  2 +-
 src/Cantarell-Light.ufo/glyphs/E_ng.glif           | 46 +++++------
 src/Cantarell-Light.ufo/glyphs/E_th.glif           |  4 +-
 src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif       |  2 +-
 src/Cantarell-Light.ufo/glyphs/H_bar.glif          |  4 +-
 src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/H_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/I_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_breve.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_circumflex.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_dieresis.glif     |  4 +-
 .../glyphs/I_dieresisacute.glif                    |  6 +-
 src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_hookabove.glif    |  4 +-
 .../glyphs/I_invertedbreve.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_macron.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_ogonek.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/I_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_J_.glif           |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif  |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_j.glif            |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_linebelow.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/N_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_-cy.glif          |  2 +-
 src/Cantarell-Light.ufo/glyphs/O_E_.glif           | 90 +++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/O_acute.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_breve.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_caron.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_circumflex.glif   |  4 +-
 .../glyphs/O_circumflexacute.glif                  |  4 +-
 .../glyphs/O_circumflexdotbelow.glif               |  6 +-
 .../glyphs/O_circumflexgrave.glif                  |  4 +-
 .../glyphs/O_circumflexhookabove.glif              |  4 +-
 .../glyphs/O_circumflextilde.glif                  |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif  |  2 +-
 src/Cantarell-Light.ufo/glyphs/O_dieresis.glif     |  4 +-
 .../glyphs/O_dieresismacron.glif                   |  6 +-
 .../glyphs/O_dotaccentmacron.glif                  |  6 +-
 src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif     |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_grave.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_hookabove.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_horn.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_hornacute.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_horngrave.glif    |  4 +-
 .../glyphs/O_hornhookabove.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_horntilde.glif    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif |  4 +-
 .../glyphs/O_invertedbreve.glif                    |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_macron.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_macronacute.glif  |  6 +-
 src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif  |  6 +-
 src/Cantarell-Light.ufo/glyphs/O_ogonek.glif       |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_slash.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_slashacute.glif   |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_tilde.glif        |  4 +-
 src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif   |  6 +-
 .../glyphs/O_tildedieresis.glif                    |  6 +-
 src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif  |  6 +-
 src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif   |  2 +-
 src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif         |  4 +-
 src/Cantarell-Light.ufo/glyphs/palochka-cy.glif    |  2 +-
 src/Cantarell-Regular.ufo/glyphs/A_-cy.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 +-
 .../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/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/E_m-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif       |  2 +-
 src/Cantarell-Regular.ufo/glyphs/E_ng.glif         | 46 +++++------
 src/Cantarell-Regular.ufo/glyphs/E_th.glif         |  4 +-
 src/Cantarell-Regular.ufo/glyphs/F_ita-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_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_ogonek.glif     |  4 +-
 src/Cantarell-Regular.ufo/glyphs/I_tilde.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_E_.glif         | 90 +++++++++++-----------
 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/Y_i-cy.glif       |  4 +-
 src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif  |  2 +-
 330 files changed, 855 insertions(+), 855 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
index 893e252a..881717c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_acute.glif b/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
index 0aec4cac..36f4db71 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="274"/>
+    <component base="acutecomb.case" xOffset="278"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif
index 4af7cc47..81d34c68 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Bold.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="708"/>
+  <advance width="705"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="120"/>
+    <component base="brevecomb-cy.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breve.glif b/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
index 98ac3bcf..14975b0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="120"/>
+    <component base="brevecomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
index a54e07d1..a86a5a9c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="157" yOffset="4"/>
+    <component base="brevecomb_acutecomb.case" xOffset="161" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
index e15fecf9..c269add5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="120"/>
+    <component base="dotbelowcomb" xOffset="207"/>
+    <component base="brevecomb.case" xOffset="124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
index 791f8f80..77e4afd1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="154" yOffset="4"/>
+    <component base="brevecomb_gravecomb.case" xOffset="158" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
index 6822653f..553ad7b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="157" yOffset="4"/>
+    <component base="brevecomb_hookabovecomb.case" xOffset="161" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif b/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
index 43c31bc9..6aef54af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="135" yOffset="4"/>
+    <component base="brevecomb_tildecomb.case" xOffset="139" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_caron.glif b/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
index 5e9eaf68..92732142 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="139"/>
+    <component base="caroncomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
index a1afe515..ab650ddb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="154"/>
+    <component base="circumflexcomb.case" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
index 6e1217da..c78beb69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="200" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="204" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
index 6669e245..b8f2b5ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="154"/>
+    <component base="dotbelowcomb" xOffset="207"/>
+    <component base="circumflexcomb.case" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
index 6f93652b..5bcc3244 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="200" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="204" 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 7a979a01..72ea894f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="200" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="204" 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 433efc5c..18539e20 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="180" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="184" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
index 6e239ed6..ddeff178 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="70"/>
+    <component base="dblgravecomb.case" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif
index 793a6039..a1a223c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Bold.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="708"/>
+  <advance width="705"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
index 005d4e4f..e091915d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="78"/>
+    <component base="dieresiscomb.case" xOffset="82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
index 20cb1856..4e44e670 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="207"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_grave.glif b/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
index 2cd765ab..055b016d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="124"/>
+    <component base="gravecomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
index a728d454..f37baec3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="198"/>
+    <component base="hookabovecomb.case" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
index 62dd6318..34ad1652 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="122"/>
+    <component base="breveinvertedcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_macron.glif b/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
index 49789068..43c033f0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="114"/>
+    <component base="macroncomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
index 25a38703..d7198d30 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="199"/>
+    <component base="ogonekcomb" xOffset="203"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ring.glif b/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
index d832502f..e94ab9af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="187"/>
+    <component base="ringcomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
index 3e162adc..43d5e793 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="192"/>
+    <component base="ringcomb_acutecomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
index 2c3166b6..673a77fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="708"/>
+  <advance width="705"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="124"/>
+    <component base="tildecomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
index bf78bb06..de73b5aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1384"/>
+  <advance width="1371"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="734"/>
+    <component base="Zcaron" xOffset="721"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_caron.glif
index 1cff80ca..31078020 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="734"/>
+  <advance width="721"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="121"/>
+    <component base="caroncomb.case" xOffset="109"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_croat.glif b/src/Cantarell-Bold.ufo/glyphs/D_croat.glif
index 71d96efc..7d8196d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="734"/>
+  <advance width="721"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/D_dotbelow.glif
index 3f13e7a7..d872f1a1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="734"/>
+  <advance width="721"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="208"/>
+    <component base="dotbelowcomb" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif
index eee5ca31..694309a5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="734"/>
+  <advance width="721"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="113"/>
+    <component base="macronbelowcomb" xOffset="101"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif
index b3b58d9f..199a42f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1224"/>
+  <advance width="1211"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="734"/>
+    <component base="zcaron" xOffset="721"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif
index 260e16a2..7f078b79 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Bold.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="892"/>
+  <advance width="868"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif
index 7478dee2..9736674a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Bold.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="755"/>
+  <advance width="731"/>
   <unicode hex="041D"/>
   <anchor x="651" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
index d1c58b37..4a6275ab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="785"/>
+  <advance width="761"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="67" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="230" y="470" type="line"/>
-      <point x="218" y="460" type="line"/>
-      <point x="566" y="-37" type="line"/>
-      <point x="718" y="0" type="line"/>
-      <point x="718" y="694" type="line"/>
-      <point x="555" y="694" type="line"/>
-      <point x="553" y="216" type="line"/>
-      <point x="574" y="219" type="line"/>
-      <point x="259" y="694" type="line"/>
-      <point x="67" y="694" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="218" y="0" type="line"/>
+      <point x="218" y="470" type="line"/>
+      <point x="206" y="460" type="line"/>
+      <point x="554" y="-37" type="line"/>
+      <point x="706" y="0" type="line"/>
+      <point x="706" y="694" type="line"/>
+      <point x="543" y="694" type="line"/>
+      <point x="541" y="216" type="line"/>
+      <point x="562" y="219" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="55" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="555" y="-243" type="line"/>
-      <point x="659" y="-213"/>
-      <point x="718" y="-121"/>
-      <point x="718" y="-13" type="curve" smooth="yes"/>
-      <point x="718" y="0" type="line"/>
-      <point x="555" y="0" type="line"/>
-      <point x="555" y="-25" type="line" smooth="yes"/>
-      <point x="555" y="-82"/>
-      <point x="535" y="-127"/>
-      <point x="500" y="-147" type="curve"/>
+      <point x="543" y="-243" type="line"/>
+      <point x="647" y="-213"/>
+      <point x="706" y="-121"/>
+      <point x="706" y="-13" type="curve" smooth="yes"/>
+      <point x="706" y="0" type="line"/>
+      <point x="543" y="0" type="line"/>
+      <point x="543" y="-25" type="line" smooth="yes"/>
+      <point x="543" y="-82"/>
+      <point x="523" y="-127"/>
+      <point x="488" y="-147" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_th.glif b/src/Cantarell-Bold.ufo/glyphs/E_th.glif
index b31b1d3b..1e84b030 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="734"/>
+  <advance width="721"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-39" yOffset="46"/>
+    <component base="strokeshortcomb.case" xOffset="-51" yOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif
index 35648400..0d49a829 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Bold.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="760"/>
+  <advance width="756"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_bar.glif b/src/Cantarell-Bold.ufo/glyphs/H_bar.glif
index db122da4..5acde17f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="755"/>
+  <advance width="731"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-63" yOffset="223"/>
+    <component base="strokelongcomb" xOffset="-75" yOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_brevebelow.glif b/src/Cantarell-Bold.ufo/glyphs/H_brevebelow.glif
index d245a2d8..f7372d07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="755"/>
+  <advance width="731"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="144"/>
+    <component base="brevebelowcomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif
index 0c724021..11983870 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="755"/>
+  <advance width="731"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="178"/>
+    <component base="circumflexcomb.case" xOffset="166"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif
index 4df9e4d3..975c6a4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="755"/>
+  <advance width="731"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="227"/>
+    <component base="dotbelowcomb" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif
index a1c8cbd0..79c4242f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_acute.glif b/src/Cantarell-Bold.ufo/glyphs/I_acute.glif
index 48db76da..a255b185 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="76"/>
+    <component base="acutecomb.case" xOffset="64"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_breve.glif b/src/Cantarell-Bold.ufo/glyphs/I_breve.glif
index 7d60fb54..2a74447f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-78"/>
+    <component base="brevecomb.case" xOffset="-90"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_caron.glif b/src/Cantarell-Bold.ufo/glyphs/I_caron.glif
index 330c4cde..03c2bd0f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-59"/>
+    <component base="caroncomb.case" xOffset="-71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif
index b2b8b435..b80fb4b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-44"/>
+    <component base="circumflexcomb.case" xOffset="-56"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif
index 77902bc3..c344eece 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-128"/>
+    <component base="dblgravecomb.case" xOffset="-140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif
index 26564e14..4e88497f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
+    <component base="dieresiscomb.case" xOffset="-132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif
index a31341c1..5d82be4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
-    <component base="acutecomb.case" xOffset="76" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="-132"/>
+    <component base="acutecomb.case" xOffset="64" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/I_dotaccent.glif
index 9fd4b7fe..d8e10932 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <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-Bold.ufo/glyphs/I_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif
index 7718fc14..a2999dc5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="5"/>
+    <component base="dotbelowcomb" xOffset="-7"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_grave.glif b/src/Cantarell-Bold.ufo/glyphs/I_grave.glif
index 5130e873..329a1ad2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-74"/>
+    <component base="gravecomb.case" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif
index a377e4a8..8ba985e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case"/>
+    <component base="hookabovecomb.case" xOffset="-12"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif
index c2620e36..ae65e158 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-76"/>
+    <component base="breveinvertedcomb.case" xOffset="-88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_macron.glif b/src/Cantarell-Bold.ufo/glyphs/I_macron.glif
index 48ff33f7..252f37b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-55"/>
+    <component base="macroncomb.narrow.case" xOffset="-67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif
index f387b58e..d82d3864 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-239"/>
+    <component base="ogonekcomb.narrow" xOffset="-251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif
index ad1fc263..458c8c0a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-74"/>
+    <component base="tildecomb.case" xOffset="-86"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif
index 55b0c16a..93571ec5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="892"/>
+  <advance width="868"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="297"/>
+    <component base="dotbelowcomb" xOffset="285"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_J_.glif b/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
index ed63dc93..86d91050 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1235"/>
+  <advance width="1211"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="780"/>
+    <component base="J" xOffset="756"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_acute.glif b/src/Cantarell-Bold.ufo/glyphs/N_acute.glif
index 25ed5e4d..054c8e16 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="310"/>
+    <component base="acutecomb.case" xOffset="298"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_caron.glif b/src/Cantarell-Bold.ufo/glyphs/N_caron.glif
index fe9c492a..a74e335e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="175"/>
+    <component base="caroncomb.case" xOffset="163"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif
index 4c3a4f13..e86b53ae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="271"/>
+    <component base="commaaccentcomb" xOffset="259"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif
index 2f673bd1..819ec30b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="244"/>
+    <component base="dotaccentcomb.case" xOffset="232"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif
index 64082c07..e8309f35 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="239"/>
+    <component base="dotbelowcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_j.glif b/src/Cantarell-Bold.ufo/glyphs/N_j.glif
index 4557b9e2..b99ab734 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="1067"/>
+  <advance width="1043"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="780"/>
+    <component base="j" xOffset="756"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif
index c5b4754a..34ecb263 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="144"/>
+    <component base="macronbelowcomb" xOffset="132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif
index d771cc22..d47cd066 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="780"/>
+  <advance width="756"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="160"/>
+    <component base="tildecomb.case" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
index 1854468a..79e4aed6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="041E"/>
   <anchor x="380" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
index 3caf32bc..b18d0e23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
@@ -1,61 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="1043"/>
+  <advance width="1041"/>
   <unicode hex="0152"/>
-  <anchor x="605" y="0" name="bottom"/>
-  <anchor x="605" y="694" name="top"/>
+  <anchor x="603" y="0" name="bottom"/>
+  <anchor x="603" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="404" y="-10" type="curve" smooth="yes"/>
-      <point x="482" y="-10"/>
-      <point x="555" y="7"/>
-      <point x="610" y="38" type="curve"/>
-      <point x="519" y="167" type="line"/>
-      <point x="491" y="150"/>
-      <point x="455" y="140"/>
-      <point x="413" y="140" type="curve" smooth="yes"/>
-      <point x="289" y="140"/>
-      <point x="206" y="224"/>
-      <point x="206" y="351" type="curve" smooth="yes"/>
-      <point x="206" y="473"/>
-      <point x="283" y="554"/>
-      <point x="403" y="554" type="curve" smooth="yes"/>
-      <point x="443" y="554"/>
-      <point x="480" y="545"/>
-      <point x="510" y="528" type="curve"/>
-      <point x="610" y="660" type="line"/>
-      <point x="557" y="688"/>
-      <point x="488" y="704"/>
-      <point x="413" y="704" type="curve" smooth="yes"/>
-      <point x="180" y="704"/>
-      <point x="26" y="559"/>
-      <point x="26" y="341" type="curve" smooth="yes"/>
-      <point x="26" y="130"/>
-      <point x="176" y="-10"/>
+      <point x="402" y="-10" type="curve" smooth="yes"/>
+      <point x="480" y="-10"/>
+      <point x="553" y="7"/>
+      <point x="608" y="38" type="curve"/>
+      <point x="517" y="167" type="line"/>
+      <point x="489" y="150"/>
+      <point x="453" y="140"/>
+      <point x="411" y="140" type="curve" smooth="yes"/>
+      <point x="287" y="140"/>
+      <point x="204" y="224"/>
+      <point x="204" y="351" type="curve" smooth="yes"/>
+      <point x="204" y="473"/>
+      <point x="281" y="554"/>
+      <point x="401" y="554" type="curve" smooth="yes"/>
+      <point x="441" y="554"/>
+      <point x="478" y="545"/>
+      <point x="508" y="528" type="curve"/>
+      <point x="608" y="660" type="line"/>
+      <point x="555" y="688"/>
+      <point x="486" y="704"/>
+      <point x="411" y="704" type="curve" smooth="yes"/>
+      <point x="178" y="704"/>
+      <point x="24" y="559"/>
+      <point x="24" y="341" type="curve" smooth="yes"/>
+      <point x="24" y="130"/>
+      <point x="174" y="-10"/>
     </contour>
     <contour>
-      <point x="500" y="0" type="line"/>
-      <point x="673" y="0" type="line"/>
-      <point x="673" y="694" type="line"/>
-      <point x="500" y="694" type="line"/>
+      <point x="498" y="0" type="line"/>
+      <point x="671" y="0" type="line"/>
+      <point x="671" y="694" type="line"/>
+      <point x="498" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="580" y="0" type="line"/>
-      <point x="998" y="0" type="line"/>
-      <point x="998" y="152" type="line"/>
-      <point x="580" y="152" type="line"/>
+      <point x="578" y="0" type="line"/>
+      <point x="996" y="0" type="line"/>
+      <point x="996" y="152" type="line"/>
+      <point x="578" y="152" type="line"/>
     </contour>
     <contour>
-      <point x="580" y="278" type="line"/>
-      <point x="970" y="278" type="line"/>
-      <point x="970" y="430" type="line"/>
-      <point x="580" y="430" type="line"/>
+      <point x="578" y="278" type="line"/>
+      <point x="968" y="278" type="line"/>
+      <point x="968" y="430" type="line"/>
+      <point x="578" y="430" type="line"/>
     </contour>
     <contour>
-      <point x="580" y="542" type="line"/>
-      <point x="998" y="542" type="line"/>
-      <point x="998" y="694" type="line"/>
-      <point x="580" y="694" type="line"/>
+      <point x="578" y="542" type="line"/>
+      <point x="996" y="542" type="line"/>
+      <point x="996" y="694" type="line"/>
+      <point x="578" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_acute.glif b/src/Cantarell-Bold.ufo/glyphs/O_acute.glif
index 2a5a9638..83a66adf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_barred-cy.glif b/src/Cantarell-Bold.ufo/glyphs/O_barred-cy.glif
index 3713125c..bbd6ff9c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Bold.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="760"/>
+  <advance width="756"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-37" yOffset="4"/>
+    <component base="_bar-cy" xOffset="-39" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_breve.glif b/src/Cantarell-Bold.ufo/glyphs/O_breve.glif
index 385d9427..155a65ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="147"/>
+    <component base="brevecomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_caron.glif b/src/Cantarell-Bold.ufo/glyphs/O_caron.glif
index 90b28b2f..14fde116 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="166"/>
+    <component base="caroncomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif
index 61b9761d..a7f19d82 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <component base="circumflexcomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
index dd82387e..921ba0b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="227" yOffset="4"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="225" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif
index 6a1a7f88..719fa354 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="230"/>
-    <component base="circumflexcomb.case" xOffset="181"/>
+    <component base="dotbelowcomb" xOffset="228"/>
+    <component base="circumflexcomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
index b82d4a21..8719436d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="227" yOffset="4"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="225" 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 7d7b4e20..b436f3dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="227" yOffset="4"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="225" 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 fe03618b..5ec592ca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="207" yOffset="4"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="205" yOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif
index 2c7c2d8c..ebe3f67c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="97"/>
+    <component base="dblgravecomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
index 4e539815..1fa81a6e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Bold.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="760"/>
+  <advance width="756"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif
index 8a54662a..c3f89b0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif
index 8bb3b188..759ef05d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="105"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_dotaccentmacron.glif
index 6ffba30d..b1892da3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="235"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="252"/>
+    <component base="dotaccentcomb.case" xOffset="233"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="252"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/O_dotbelow.glif
index bad7c678..2533da42 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="230"/>
+    <component base="dotbelowcomb" xOffset="228"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_grave.glif b/src/Cantarell-Bold.ufo/glyphs/O_grave.glif
index 16e58f9f..953ac16a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="151"/>
+    <component base="gravecomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif
index ab0844b3..871864ad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="225"/>
+    <component base="hookabovecomb.case" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horn.glif b/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
index acfbad81..aa8d9ccc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="555" yOffset="212"/>
+    <component base="horncomb" xOffset="553" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif b/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif
index 1ac6fb0e..9e6109e5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif
index 8a93fe08..cc0261fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="230"/>
+    <component base="dotbelowcomb" xOffset="228"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif b/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif
index bc68950b..943420f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="151"/>
+    <component base="gravecomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif
index a56c8512..610b130d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="225"/>
+    <component base="hookabovecomb.case" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif b/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif
index fd0f9c9e..c1d5e4c1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="842"/>
+  <advance width="838"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif
index c1194923..c63a6241 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="142"/>
+    <component base="hungarumlautcomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif
index 7b83c5b3..f4d31f06 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="149"/>
+    <component base="breveinvertedcomb.case" xOffset="147"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_macron.glif b/src/Cantarell-Bold.ufo/glyphs/O_macron.glif
index 79f91fff..b0e04f39 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
+    <component base="macroncomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif
index 05a70995..2efdc58b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
-    <component base="acutecomb.case" xOffset="301" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="139"/>
+    <component base="acutecomb.case" xOffset="299" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_macrongrave.glif
index 8004b74a..33a52ba4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="141"/>
-    <component base="gravecomb.case" xOffset="151" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="139"/>
+    <component base="gravecomb.case" xOffset="149" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/O_ogonek.glif
index 819efcb8..30fd344f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="5"/>
+    <component base="ogonekcomb.tall.case" xOffset="3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_slash.glif b/src/Cantarell-Bold.ufo/glyphs/O_slash.glif
index 70406dfa..9d49f485 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="92" yOffset="8"/>
+    <component base="slashlongcomb.case" xOffset="90" yOffset="8"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_slashacute.glif b/src/Cantarell-Bold.ufo/glyphs/O_slashacute.glif
index 462acbac..ec61da7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="301"/>
+    <component base="acutecomb.case" xOffset="299"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif
index 4d259d10..87e5d0ac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
+    <component base="tildecomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif
index ce3e890f..6cdaf4fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="acutecomb.case" xOffset="301" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="149"/>
+    <component base="acutecomb.case" xOffset="299" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_tildedieresis.glif
index c244f48d..34adaf9f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="dieresiscomb.case" xOffset="105" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="149"/>
+    <component base="dieresiscomb.case" xOffset="103" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_tildemacron.glif
index e2eacc48..13729324 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="760"/>
+  <advance width="756"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="151"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="149"/>
+    <component base="macroncomb.case" xOffset="139" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif
index 549d42b6..8ae1f4a4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Bold.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="310"/>
+  <advance width="286"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif
index 2ace02bf..8bdeade5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Bold.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="310"/>
+  <advance width="286"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-120"/>
+    <component base="dieresiscomb.case" xOffset="-132"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif
index 7464a37a..dd5c7a2e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="310"/>
+  <advance width="286"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
index aeca432b..ca27d581 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A-cy" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_acute.glif b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
index b3787921..65df1f63 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aacute" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="268"/>
+    <component base="acutecomb.case" xOffset="256"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
index 2fa1fde8..404d2b53 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve-cy" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="133"/>
+    <component base="brevecomb-cy.case" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breve.glif b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
index daa93b58..a2fca409 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreve" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="123"/>
+    <component base="brevecomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
index ba76237a..574a0e8d 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="146" yOffset="14"/>
+    <component base="brevecomb_acutecomb.case" xOffset="134" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
index 1aec1e16..db4cfe62 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="brevecomb.case" xOffset="123"/>
+    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="brevecomb.case" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
index 23b3473b..68f527b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="135" yOffset="14"/>
+    <component base="brevecomb_gravecomb.case" xOffset="123" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
index 6e7c9609..ef754bbe 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="140" yOffset="14"/>
+    <component base="brevecomb_hookabovecomb.case" xOffset="128" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif 
b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
index 2f824d6a..ef000cd6 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="107" yOffset="14"/>
+    <component base="brevecomb_tildecomb.case" xOffset="95" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_caron.glif b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
index 532c1e6d..0059cc3a 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acaron" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="151"/>
+    <component base="caroncomb.case" xOffset="139"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
index b5f2e46f..d1cc6796 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflex" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="149"/>
+    <component base="circumflexcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
index dad442b0..63e1eed7 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="203" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="191" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
index d3f78220..7ff30d78 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
-    <component base="circumflexcomb.case" xOffset="149"/>
+    <component base="dotbelowcomb" xOffset="191"/>
+    <component base="circumflexcomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
index 82ed3b2d..85373e9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="203" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="191" 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 b02c3b31..96cb6a46 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="203" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="191" 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 f9d221ed..1b878856 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="161" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="149" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
index f7f18920..5ef8411a 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adblgrave" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="83"/>
+    <component base="dblgravecomb.case" xOffset="71"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
index e4113791..07b30de5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis-cy" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="106"/>
+    <component base="dieresiscomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
index 4857292a..f15cb165 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adieresis" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="106"/>
+    <component base="dieresiscomb.case" xOffset="94"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
index 81b14647..c7f48b80 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Adotbelow" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="203"/>
+    <component base="dotbelowcomb" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_grave.glif b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
index d4e7360d..68eb8062 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Agrave" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="129"/>
+    <component base="gravecomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
index 98a1f4cb..7c957dbb 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ahookabove" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="171"/>
+    <component base="hookabovecomb.case" xOffset="159"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
index d4e9e986..531332f5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="120"/>
+    <component base="breveinvertedcomb.case" xOffset="108"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_macron.glif b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
index 66f70954..5e5e2a9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Amacron" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="88"/>
+    <component base="macroncomb.case" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
index 43d5baa3..ef1241fc 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aogonek" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="182"/>
+    <component base="ogonekcomb" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ring.glif b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
index 508acc83..8cb59c34 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ring.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aring" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="152"/>
+    <component base="ringcomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
index 83267fb7..509cc29a 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aringacute" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="167"/>
+    <component base="ringcomb_acutecomb.case" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
index 7f22ebb3..7d666a6e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Atilde" format="2">
-  <advance width="634"/>
+  <advance width="598"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="82"/>
+    <component base="tildecomb.case" xOffset="70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
index 060b1c9b..7f4a0d88 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="DZcaron" format="2">
-  <advance width="1308"/>
+  <advance width="1295"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="692"/>
+    <component base="Zcaron" xOffset="679"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_caron.glif b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
index b2afcf8a..bed9c6f8 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcaron" format="2">
-  <advance width="692"/>
+  <advance width="679"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="155"/>
+    <component base="caroncomb.case" xOffset="149"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_croat.glif b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
index f4728bba..cfe15410 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_croat.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_croat.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dcroat" format="2">
-  <advance width="692"/>
+  <advance width="679"/>
   <unicode hex="0110"/>
   <outline>
     <component base="Eth"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
index 99943dd1..9e3e14e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ddotbelow" format="2">
-  <advance width="692"/>
+  <advance width="679"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="220"/>
+    <component base="dotbelowcomb" xOffset="214"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
index 4446287d..0467ba24 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dlinebelow" format="2">
-  <advance width="692"/>
+  <advance width="679"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="90"/>
+    <component base="macronbelowcomb" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
index 0b48913e..3940e105 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_zcaron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dzcaron" format="2">
-  <advance width="1106"/>
+  <advance width="1093"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="692"/>
+    <component base="zcaron" xOffset="679"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
index 0281c222..3a0b3002 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_m-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Em-cy" format="2">
-  <advance width="835"/>
+  <advance width="823"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
index 1925d8f0..b0dced65 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_n-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="En-cy" format="2">
-  <advance width="702"/>
+  <advance width="690"/>
   <unicode hex="041D"/>
   <anchor x="619" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ng.glif b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
index 9deeb7b1..6dba7418 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="729"/>
+  <advance width="717"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="110" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="130" y="674" type="line"/>
-      <point x="128" y="674" type="line"/>
-      <point x="599" y="-10" type="line"/>
-      <point x="619" y="0" type="line"/>
-      <point x="619" y="694" type="line"/>
-      <point x="599" y="694" type="line"/>
-      <point x="599" y="20" type="line"/>
-      <point x="603" y="20" type="line"/>
-      <point x="139" y="694" type="line"/>
-      <point x="110" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="674" type="line"/>
+      <point x="122" y="674" type="line"/>
+      <point x="593" y="-10" type="line"/>
+      <point x="613" y="0" type="line"/>
+      <point x="613" y="694" type="line"/>
+      <point x="593" y="694" type="line"/>
+      <point x="593" y="20" type="line"/>
+      <point x="597" y="20" type="line"/>
+      <point x="133" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="513" y="-230" type="line"/>
-      <point x="577" y="-200"/>
-      <point x="619" y="-117"/>
-      <point x="619" y="-23" type="curve" smooth="yes"/>
-      <point x="619" y="0" type="line"/>
-      <point x="598" y="0" type="line"/>
-      <point x="598" y="-35" type="line" smooth="yes"/>
-      <point x="598" y="-112"/>
-      <point x="562" y="-186"/>
-      <point x="508" y="-220" type="curve"/>
+      <point x="507" y="-230" type="line"/>
+      <point x="571" y="-200"/>
+      <point x="613" y="-117"/>
+      <point x="613" y="-23" type="curve" smooth="yes"/>
+      <point x="613" y="0" type="line"/>
+      <point x="592" y="0" type="line"/>
+      <point x="592" y="-35" type="line" smooth="yes"/>
+      <point x="592" y="-112"/>
+      <point x="556" y="-186"/>
+      <point x="502" y="-220" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_th.glif b/src/Cantarell-Light.ufo/glyphs/E_th.glif
index 7972198f..b92bef8e 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_th.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_th.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eth" format="2">
-  <advance width="692"/>
+  <advance width="679"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-68" yOffset="65"/>
+    <component base="strokeshortcomb.case" xOffset="-74" yOffset="65"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
index 094183da..6dba9c60 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_ita-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Fita-cy" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_bar.glif b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
index cd003bc0..50fa5a4e 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_bar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbar" format="2">
-  <advance width="702"/>
+  <advance width="690"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-107" yOffset="192"/>
+    <component base="strokelongcomb" xOffset="-113" yOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif 
b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
index 55ffe824..082dff15 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_brevebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hbrevebelow" format="2">
-  <advance width="702"/>
+  <advance width="690"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="147"/>
+    <component base="brevebelowcomb" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
index 1d2c1f51..dbf51430 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hcircumflex" format="2">
-  <advance width="702"/>
+  <advance width="690"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="176"/>
+    <component base="circumflexcomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
index a7ad186e..f59a0441 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Hdotbelow" format="2">
-  <advance width="702"/>
+  <advance width="690"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="233"/>
+    <component base="dotbelowcomb" xOffset="227"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
index d9128c2a..2685af0a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I-cy" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_acute.glif b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
index 50340365..8c0d712b 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iacute" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="63"/>
+    <component base="acutecomb.case" xOffset="57"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_breve.glif b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
index 27e3aa3b..24134a96 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ibreve" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-82"/>
+    <component base="brevecomb.case" xOffset="-88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_caron.glif b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
index 983a3558..c69c2328 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icaron" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-54"/>
+    <component base="caroncomb.case" xOffset="-60"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
index 057d863d..be3184a4 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Icircumflex" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-56"/>
+    <component base="circumflexcomb.case" xOffset="-62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
index 188a0e4f..fe68c8f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idblgrave" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-122"/>
+    <component base="dblgravecomb.case" xOffset="-128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
index c195d1a3..f47d945a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresis" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
+    <component base="dieresiscomb.case" xOffset="-105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
index f3f377d9..f2fe1cb4 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idieresisacute" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
-    <component base="acutecomb.case" xOffset="63" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="-105"/>
+    <component base="acutecomb.case" xOffset="57" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
index 2d7840f5..35d285ea 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotaccent" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="2"/>
+    <component base="dotaccentcomb.case" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
index 8677535c..cee5a758 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Idotbelow" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="1"/>
+    <component base="dotbelowcomb" xOffset="-5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_grave.glif b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
index 5ad8361a..d935cb8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Igrave" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-76"/>
+    <component base="gravecomb.case" xOffset="-82"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
index 8151242c..eb0770fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ihookabove" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-34"/>
+    <component base="hookabovecomb.case" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
index 1ba13fbb..86e2c492 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iinvertedbreve" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-85"/>
+    <component base="breveinvertedcomb.case" xOffset="-91"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_macron.glif b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
index 367eec7c..b1812f11 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Imacron" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-91"/>
+    <component base="macroncomb.narrow.case" xOffset="-97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
index 0e1dc81d..3a74af39 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iogonek" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-251"/>
+    <component base="ogonekcomb.narrow" xOffset="-257"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
index e1cac42d..c2063268 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Itilde" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-123"/>
+    <component base="tildecomb.case" xOffset="-129"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
index efa9f400..136bd6e7 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mdotbelow" format="2">
-  <advance width="835"/>
+  <advance width="823"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="312"/>
+    <component base="dotbelowcomb" xOffset="306"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_J_.glif b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
index 95737588..2758b77a 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_J_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="NJ" format="2">
-  <advance width="1130"/>
+  <advance width="1118"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="732"/>
+    <component base="J" xOffset="720"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_acute.glif b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
index d488256d..74752d13 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nacute" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="319"/>
+    <component base="acutecomb.case" xOffset="313"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_caron.glif b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
index f38b2988..b0628dd7 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncaron" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="202"/>
+    <component base="caroncomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
index f5c04c3f..551d8353 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ncommaaccent" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="248"/>
+    <component base="commaaccentcomb" xOffset="242"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
index 882a00fc..a2c11e87 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotaccent" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="258"/>
+    <component base="dotaccentcomb.case" xOffset="252"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
index 8a80caec..cbcf0d00 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ndotbelow" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="257"/>
+    <component base="dotbelowcomb" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_j.glif b/src/Cantarell-Light.ufo/glyphs/N_j.glif
index 6c228c1c..d83c354d 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_j.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nj" format="2">
-  <advance width="934"/>
+  <advance width="922"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="732"/>
+    <component base="j" xOffset="720"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
index 5bbadf54..6fda899c 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nlinebelow" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="127"/>
+    <component base="macronbelowcomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
index bebbf8b1..6ea9512d 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ntilde" format="2">
-  <advance width="732"/>
+  <advance width="720"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="133"/>
+    <component base="tildecomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
index dc36687a..293e04ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O-cy" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="041E"/>
   <anchor x="377" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_E_.glif b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
index 74c7d665..47797d9e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
@@ -1,61 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="952"/>
+  <advance width="945"/>
   <unicode hex="0152"/>
-  <anchor x="533" y="0" name="bottom"/>
-  <anchor x="533" y="694" name="top"/>
+  <anchor x="526" y="0" name="bottom"/>
+  <anchor x="526" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="426" y="-10" type="curve" smooth="yes"/>
-      <point x="458" y="-10"/>
-      <point x="507" y="-6"/>
-      <point x="538" y="0" type="curve"/>
-      <point x="533" y="18" type="line"/>
-      <point x="506" y="12"/>
-      <point x="458" y="9"/>
-      <point x="428" y="9" type="curve" smooth="yes"/>
-      <point x="227" y="9"/>
-      <point x="93" y="145"/>
-      <point x="93" y="346" type="curve" smooth="yes"/>
-      <point x="93" y="547"/>
-      <point x="227" y="680"/>
-      <point x="426" y="680" type="curve" smooth="yes"/>
-      <point x="454" y="680"/>
-      <point x="501" y="677"/>
-      <point x="528" y="672" type="curve"/>
-      <point x="532" y="691" type="line"/>
-      <point x="504" y="696"/>
-      <point x="458" y="699"/>
-      <point x="430" y="699" type="curve" smooth="yes"/>
-      <point x="215" y="699"/>
-      <point x="71" y="555"/>
-      <point x="71" y="343" type="curve" smooth="yes"/>
-      <point x="71" y="131"/>
-      <point x="214" y="-10"/>
+      <point x="419" y="-10" type="curve" smooth="yes"/>
+      <point x="451" y="-10"/>
+      <point x="500" y="-6"/>
+      <point x="531" y="0" type="curve"/>
+      <point x="526" y="18" type="line"/>
+      <point x="499" y="12"/>
+      <point x="451" y="9"/>
+      <point x="421" y="9" type="curve" smooth="yes"/>
+      <point x="220" y="9"/>
+      <point x="86" y="145"/>
+      <point x="86" y="346" type="curve" smooth="yes"/>
+      <point x="86" y="547"/>
+      <point x="220" y="680"/>
+      <point x="419" y="680" type="curve" smooth="yes"/>
+      <point x="447" y="680"/>
+      <point x="494" y="677"/>
+      <point x="521" y="672" type="curve"/>
+      <point x="525" y="691" type="line"/>
+      <point x="497" y="696"/>
+      <point x="451" y="699"/>
+      <point x="423" y="699" type="curve" smooth="yes"/>
+      <point x="208" y="699"/>
+      <point x="64" y="555"/>
+      <point x="64" y="343" type="curve" smooth="yes"/>
+      <point x="64" y="131"/>
+      <point x="207" y="-10"/>
     </contour>
     <contour>
-      <point x="509" y="0" type="line"/>
-      <point x="530" y="0" type="line"/>
-      <point x="530" y="694" type="line"/>
-      <point x="509" y="694" type="line"/>
+      <point x="502" y="0" type="line"/>
+      <point x="523" y="0" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="502" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="518" y="0" type="line"/>
-      <point x="903" y="0" type="line"/>
-      <point x="903" y="18" type="line"/>
-      <point x="518" y="18" type="line"/>
+      <point x="511" y="0" type="line"/>
+      <point x="896" y="0" type="line"/>
+      <point x="896" y="18" type="line"/>
+      <point x="511" y="18" type="line"/>
     </contour>
     <contour>
-      <point x="518" y="351" type="line"/>
-      <point x="878" y="351" type="line"/>
-      <point x="878" y="369" type="line"/>
-      <point x="518" y="369" type="line"/>
+      <point x="511" y="351" type="line"/>
+      <point x="871" y="351" type="line"/>
+      <point x="871" y="369" type="line"/>
+      <point x="511" y="369" type="line"/>
     </contour>
     <contour>
-      <point x="518" y="676" type="line"/>
-      <point x="903" y="676" type="line"/>
-      <point x="903" y="694" type="line"/>
-      <point x="518" y="694" type="line"/>
+      <point x="511" y="676" type="line"/>
+      <point x="896" y="676" type="line"/>
+      <point x="896" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_acute.glif b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
index c6c5e9af..515c8c98 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_acute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oacute" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="313"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
index 9faecdb4..31ebf853 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_barred-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obarred-cy" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-81" yOffset="3"/>
+    <component base="_bar-cy" xOffset="-88" yOffset="3"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_breve.glif b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
index a5d0de18..8001d2dc 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_breve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Obreve" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="175"/>
+    <component base="brevecomb.case" xOffset="168"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_caron.glif b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
index 1db587b5..e0827090 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_caron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocaron" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="203"/>
+    <component base="caroncomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
index 81b07e20..c45a3b55 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflex" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="201"/>
+    <component base="circumflexcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
index 29fe1f9e..ae6224ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="255" yOffset="14"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="248" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
index 3046c1f7..355fa031 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexdotbelow" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="258"/>
-    <component base="circumflexcomb.case" xOffset="201"/>
+    <component base="dotbelowcomb" xOffset="251"/>
+    <component base="circumflexcomb.case" xOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
index 8e1e65a7..c7653366 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="255" yOffset="14"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="248" 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 81be6ed8..f9103223 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="255" yOffset="14"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="248" 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 dcdd5f7d..feae75c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="213" yOffset="14"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="206" yOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
index 6394d7fc..56fe3315 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odblgrave" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="135"/>
+    <component base="dblgravecomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
index 52d45fae..06dd166d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis-cy" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="04E6"/>
   <outline>
     <component base="O-cy"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
index b65291e2..cd007cde 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresis" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
+    <component base="dieresiscomb.case" xOffset="151"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
index 35f3bde8..46d6cda6 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odieresismacron" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="158"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="145"/>
+    <component base="dieresiscomb.case" xOffset="151"/>
+    <component base="macroncomb.case" xOffset="133" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
index b8c716c0..3512f5a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotaccentmacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotaccentmacron" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="259"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="143"/>
+    <component base="dotaccentcomb.case" xOffset="252"/>
+    <component base="macroncomb.case" xOffset="133" yOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
index 4e27c1e1..80b2d31d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Odotbelow" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="258"/>
+    <component base="dotbelowcomb" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_grave.glif b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
index 8f325a20..e5f4a42b 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_grave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ograve" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="181"/>
+    <component base="gravecomb.case" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
index 0091752c..25c38cb2 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohookabove" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="216"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horn.glif b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
index 713fcf36..e1f73332 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorn" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="521" yOffset="212"/>
+    <component base="horncomb" xOffset="514" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
index b25bf249..a9f799b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornacute" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="313"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
index 28c58f5c..7d64cf1f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorndotbelow" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="258"/>
+    <component base="dotbelowcomb" xOffset="251"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
index b4de557b..3bf4d6cc 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorngrave" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="181"/>
+    <component base="gravecomb.case" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
index be340ffc..9072f6e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohornhookabove" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="216"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
index e447d7ba..385ef4aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohorntilde" format="2">
-  <advance width="776"/>
+  <advance width="761"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="134"/>
+    <component base="tildecomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
index 4c1e3f1f..3067320d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ohungarumlaut" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="206"/>
+    <component base="hungarumlautcomb.case" xOffset="199"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
index c67b2044..c9262917 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oinvertedbreve" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="172"/>
+    <component base="breveinvertedcomb.case" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macron.glif b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
index bbe572bb..4834706a 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacron" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="133"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
index 993c0607..94092d5a 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacronacute" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="acutecomb.case" xOffset="320" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="133"/>
+    <component base="acutecomb.case" xOffset="313" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif 
b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
index be12b7b9..2cf36376 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omacrongrave" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="gravecomb.case" xOffset="181" yOffset="128"/>
+    <component base="macroncomb.case" xOffset="133"/>
+    <component base="gravecomb.case" xOffset="174" yOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
index 3c2edd1d..0907ac17 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oogonek" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="58"/>
+    <component base="ogonekcomb.tall.case" xOffset="51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slash.glif b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
index 4ff2f646..ac427419 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslash" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="90" yOffset="-21"/>
+    <component base="slashlongcomb.case" xOffset="83" yOffset="-21"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
index 08ed08dd..1aec0aa8 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_slashacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Oslashacute" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="320"/>
+    <component base="acutecomb.case" xOffset="313"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
index 100d9eb2..7adc0792 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otilde" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
+    <component base="tildecomb.case" xOffset="127"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
index ad662792..a3646bfd 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildeacute" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="acutecomb.case" xOffset="320" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="127"/>
+    <component base="acutecomb.case" xOffset="313" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
index b5e93d00..e8629444 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildedieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildedieresis" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="dieresiscomb.case" xOffset="158" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="127"/>
+    <component base="dieresiscomb.case" xOffset="151" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif 
b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
index 066686d7..43311310 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_tildemacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Otildemacron" format="2">
-  <advance width="754"/>
+  <advance width="739"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="134"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="142"/>
+    <component base="tildecomb.case" xOffset="127"/>
+    <component base="macroncomb.case" xOffset="133" yOffset="142"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
index 507c7e0c..d4c4095a 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_alochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Palochka-cy" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
index 728199dd..aa05ab4a 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_i-cy.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yi-cy" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-99"/>
+    <component base="dieresiscomb.case" xOffset="-105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
index c0cf592a..d340af0a 100644
--- a/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/palochka-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="palochka-cy" format="2">
-  <advance width="241"/>
+  <advance width="229"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/A_-cy.glif
index 4b89ef7c..1332f1d4 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="642"/>
+  <advance width="625"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_acute.glif b/src/Cantarell-Regular.ufo/glyphs/A_acute.glif
index ed0140d9..8af30ee6 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="234"/>
+    <component base="acutecomb.case" xOffset="226"/>
   </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 fbcd28dd..fc1fc2a0 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="642"/>
+  <advance width="625"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="107"/>
+    <component base="brevecomb-cy.case" xOffset="99"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breve.glif b/src/Cantarell-Regular.ufo/glyphs/A_breve.glif
index ebcb06f3..6ea7ece1 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="642"/>
+  <advance width="625"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="brevecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_breveacute.glif
index 41b89a07..92f554cb 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_acutecomb.case" xOffset="147" yOffset="12"/>
+    <component base="brevecomb_acutecomb.case" xOffset="139" 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 31c1f5c6..e1bbfdd7 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
-    <component base="brevecomb.case" xOffset="113"/>
+    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="brevecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_brevegrave.glif
index c2532df2..91a6b26b 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_gravecomb.case" xOffset="140" yOffset="12"/>
+    <component base="brevecomb_gravecomb.case" xOffset="132" 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 243010d5..89095ce6 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_hookabovecomb.case" xOffset="145" yOffset="12"/>
+    <component base="brevecomb_hookabovecomb.case" xOffset="137" 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 a3fdcb37..0868840a 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb_tildecomb.case" xOffset="116" yOffset="12"/>
+    <component base="brevecomb_tildecomb.case" xOffset="108" 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 a82c6f0f..65c775bd 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="642"/>
+  <advance width="625"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="138"/>
+    <component base="caroncomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflex.glif
index 1f600d30..530df057 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="134"/>
+    <component base="circumflexcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexacute.glif
index a2755c57..7f2369f7 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="182" 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 ae49c0b1..0373bfc5 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
-    <component base="circumflexcomb.case" xOffset="134"/>
+    <component base="dotbelowcomb" xOffset="178"/>
+    <component base="circumflexcomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_circumflexgrave.glif
index 2b0e069e..85739d30 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="182" 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 46138373..7cade763 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="190" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="182" 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 ae433804..8e29eb05 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="157" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="149" 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 ee5cbcf6..e345c140 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="642"/>
+  <advance width="625"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="101"/>
+    <component base="dblgravecomb.case" xOffset="93"/>
   </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 9652b40d..21f155cf 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="642"/>
+  <advance width="625"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="86"/>
+    <component base="dieresiscomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dieresis.glif
index a9433362..585e2ac6 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="86"/>
+    <component base="dieresiscomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_dotbelow.glif
index 3a7c2d8f..1e6e186c 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="186"/>
+    <component base="dotbelowcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_grave.glif b/src/Cantarell-Regular.ufo/glyphs/A_grave.glif
index 21147d36..508d1dc9 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="127"/>
+    <component base="gravecomb.case" xOffset="119"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_hookabove.glif
index f817eb98..d6f8617d 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="642"/>
+  <advance width="625"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="178"/>
+    <component base="hookabovecomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_invertedbreve.glif
index 523fb8da..209cec35 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="642"/>
+  <advance width="625"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="125"/>
+    <component base="breveinvertedcomb.case" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_macron.glif b/src/Cantarell-Regular.ufo/glyphs/A_macron.glif
index fb38e94e..48516b34 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="642"/>
+  <advance width="625"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="80"/>
+    <component base="macroncomb.case" xOffset="72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/A_ogonek.glif
index f0e3817c..c368f010 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="642"/>
+  <advance width="625"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="173"/>
+    <component base="ogonekcomb" xOffset="165"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ring.glif b/src/Cantarell-Regular.ufo/glyphs/A_ring.glif
index 2285e9e9..ef196f34 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="149"/>
+    <component base="ringcomb.case" xOffset="141"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_ringacute.glif
index a83b5a99..2df1e7cc 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="642"/>
+  <advance width="625"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="162"/>
+    <component base="ringcomb_acutecomb.case" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/A_tilde.glif
index f50a3f78..7fc14c9d 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="642"/>
+  <advance width="625"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="82"/>
+    <component base="tildecomb.case" xOffset="74"/>
   </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 c4138388..2b5f5876 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="1355"/>
+  <advance width="1349"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="717"/>
+    <component base="Zcaron" xOffset="711"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_caron.glif b/src/Cantarell-Regular.ufo/glyphs/D_caron.glif
index 3fd4b3e5..be7e5d56 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="717"/>
+  <advance width="711"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="142"/>
+    <component base="caroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_croat.glif b/src/Cantarell-Regular.ufo/glyphs/D_croat.glif
index 9f30c874..34edd88b 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="717"/>
+  <advance width="711"/>
   <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 de66eaef..b8d003da 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="717"/>
+  <advance width="711"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="190"/>
+    <component base="dotbelowcomb" xOffset="186"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/D_linebelow.glif
index 33af5ecb..41ade85c 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="717"/>
+  <advance width="711"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="81"/>
+    <component base="macronbelowcomb" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Regular.ufo/glyphs/D_zcaron.glif
index 0e1520e7..5baaf6ea 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="1181"/>
+  <advance width="1175"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="717"/>
+    <component base="zcaron" xOffset="711"/>
   </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 5a192ffd..18c62196 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="867"/>
+  <advance width="859"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_n-cy.glif
index f05d4273..da06edce 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="729"/>
+  <advance width="721"/>
   <unicode hex="041D"/>
   <anchor x="672" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
index e8559262..278c9323 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eng" format="2">
-  <advance width="758"/>
+  <advance width="750"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="96" y="0" type="line"/>
-      <point x="174" y="0" type="line"/>
-      <point x="174" y="605" type="line"/>
-      <point x="157" y="605" type="line"/>
-      <point x="591" y="-25" type="line"/>
-      <point x="662" y="0" type="line"/>
-      <point x="662" y="694" type="line"/>
-      <point x="584" y="694" type="line"/>
-      <point x="584" y="87" type="line"/>
-      <point x="602" y="87" type="line"/>
-      <point x="191" y="694" type="line"/>
-      <point x="96" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="153" y="605" type="line"/>
+      <point x="587" y="-25" type="line"/>
+      <point x="658" y="0" type="line"/>
+      <point x="658" y="694" type="line"/>
+      <point x="580" y="694" type="line"/>
+      <point x="580" y="87" type="line"/>
+      <point x="598" y="87" type="line"/>
+      <point x="187" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="539" y="-234" type="line"/>
-      <point x="613" y="-201"/>
-      <point x="662" y="-117"/>
-      <point x="662" y="-23" type="curve" smooth="yes"/>
-      <point x="662" y="0" type="line"/>
-      <point x="582" y="0" type="line"/>
-      <point x="582" y="-35" type="line" smooth="yes"/>
-      <point x="582" y="-102"/>
-      <point x="554" y="-162"/>
-      <point x="512" y="-186" type="curve"/>
+      <point x="535" y="-234" type="line"/>
+      <point x="609" y="-201"/>
+      <point x="658" y="-117"/>
+      <point x="658" y="-23" type="curve" smooth="yes"/>
+      <point x="658" y="0" type="line"/>
+      <point x="578" y="0" type="line"/>
+      <point x="578" y="-35" type="line" smooth="yes"/>
+      <point x="578" y="-102"/>
+      <point x="550" y="-162"/>
+      <point x="508" y="-186" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_th.glif b/src/Cantarell-Regular.ufo/glyphs/E_th.glif
index 18758351..3c22857e 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="717"/>
+  <advance width="711"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-65" yOffset="49"/>
+    <component base="strokeshortcomb.case" xOffset="-69" yOffset="49"/>
   </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 3d1579f6..35648400 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="764"/>
+  <advance width="760"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_bar.glif b/src/Cantarell-Regular.ufo/glyphs/H_bar.glif
index 7739f756..1865f4b4 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="729"/>
+  <advance width="721"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-80" yOffset="197"/>
+    <component base="strokelongcomb" xOffset="-84" 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 bc816827..99d5bc73 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="729"/>
+  <advance width="721"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="159"/>
+    <component base="brevebelowcomb" xOffset="155"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_circumflex.glif
index abb672c0..51dd9940 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="729"/>
+  <advance width="721"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="177"/>
+    <component base="circumflexcomb.case" xOffset="173"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/H_dotbelow.glif
index 8e4170f9..68998e48 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="729"/>
+  <advance width="721"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="229"/>
+    <component base="dotbelowcomb" xOffset="225"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/I_-cy.glif
index b16fca96..67023ea0 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="275"/>
+  <advance width="267"/>
   <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 d4733c16..f9dd8de4 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="275"/>
+  <advance width="267"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="50"/>
+    <component base="acutecomb.case" xOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_breve.glif b/src/Cantarell-Regular.ufo/glyphs/I_breve.glif
index ec2a126b..1cbde9a8 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="275"/>
+  <advance width="267"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-71"/>
+    <component base="brevecomb.case" xOffset="-75"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_caron.glif b/src/Cantarell-Regular.ufo/glyphs/I_caron.glif
index 7ec75856..8da639cf 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="275"/>
+  <advance width="267"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-46"/>
+    <component base="caroncomb.case" xOffset="-50"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_circumflex.glif
index dd43ea31..441dd5a2 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="275"/>
+  <advance width="267"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-50"/>
+    <component base="circumflexcomb.case" xOffset="-54"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dblgrave.glif
index 1c665fa5..2d739e1f 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="275"/>
+  <advance width="267"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-83"/>
+    <component base="dblgravecomb.case" xOffset="-87"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresis.glif
index da8a780d..8ee55938 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="275"/>
+  <advance width="267"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_dieresisacute.glif
index c82970ac..4df5a704 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="275"/>
+  <advance width="267"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
-    <component base="acutecomb.case" xOffset="50" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
+    <component base="acutecomb.case" xOffset="46" 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 4b7f22c8..d4b12d37 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="275"/>
+  <advance width="267"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="2"/>
+    <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 c0894b48..34a51f7c 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="275"/>
+  <advance width="267"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="2"/>
+    <component base="dotbelowcomb" xOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_grave.glif b/src/Cantarell-Regular.ufo/glyphs/I_grave.glif
index 6b5a7e15..27da716c 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="275"/>
+  <advance width="267"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-57"/>
+    <component base="gravecomb.case" xOffset="-61"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_hookabove.glif
index 198a60e5..8f1c8b7c 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="275"/>
+  <advance width="267"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-6"/>
+    <component base="hookabovecomb.case" xOffset="-10"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_invertedbreve.glif
index ae195abd..4bfc41c3 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="275"/>
+  <advance width="267"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-59"/>
+    <component base="breveinvertedcomb.case" xOffset="-63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_macron.glif b/src/Cantarell-Regular.ufo/glyphs/I_macron.glif
index 3aa9e163..47885db1 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="275"/>
+  <advance width="267"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-76"/>
+    <component base="macroncomb.narrow.case" xOffset="-80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Regular.ufo/glyphs/I_ogonek.glif
index 5cacb3c6..96d8fbfd 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="275"/>
+  <advance width="267"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-252"/>
+    <component base="ogonekcomb.narrow" xOffset="-256"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/I_tilde.glif
index 6208f5b7..6ada5d7f 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="275"/>
+  <advance width="267"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-102"/>
+    <component base="tildecomb.case" xOffset="-106"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/M_dotbelow.glif
index fb6db497..78c6c3d3 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="867"/>
+  <advance width="859"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="298"/>
+    <component base="dotbelowcomb" xOffset="294"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_J_.glif b/src/Cantarell-Regular.ufo/glyphs/N_J_.glif
index 9c9d32bc..f33eeca0 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="1165"/>
+  <advance width="1157"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="758"/>
+    <component base="J" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_acute.glif b/src/Cantarell-Regular.ufo/glyphs/N_acute.glif
index b10e07d2..54121b6b 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="758"/>
+  <advance width="750"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="291"/>
+    <component base="acutecomb.case" xOffset="287"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_caron.glif b/src/Cantarell-Regular.ufo/glyphs/N_caron.glif
index 2c8515c3..242c2778 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="758"/>
+  <advance width="750"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="195"/>
+    <component base="caroncomb.case" xOffset="191"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_commaaccent.glif
index b611a6fe..720860e9 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="758"/>
+  <advance width="750"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="213"/>
+    <component base="commaaccentcomb" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotaccent.glif
index 9d4cf866..9c1b76bc 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="758"/>
+  <advance width="750"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="243"/>
+    <component base="dotaccentcomb.case" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_dotbelow.glif
index 628cdaf3..c706992f 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="758"/>
+  <advance width="750"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="243"/>
+    <component base="dotbelowcomb" xOffset="239"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_j.glif b/src/Cantarell-Regular.ufo/glyphs/N_j.glif
index db362ff8..dfbeff66 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="1013"/>
+  <advance width="1005"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="758"/>
+    <component base="j" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/N_linebelow.glif
index 33a9f3ff..00c5fb50 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="758"/>
+  <advance width="750"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="134"/>
+    <component base="macronbelowcomb" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/N_tilde.glif
index de5974b4..06882d37 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="758"/>
+  <advance width="750"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="139"/>
+    <component base="tildecomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/O_-cy.glif
index ea972eae..1d6a51e0 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="764"/>
+  <advance width="760"/>
   <unicode hex="041E"/>
   <anchor x="394" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
index 48d530e6..31917d57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
@@ -1,61 +1,61 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="OE" format="2">
-  <advance width="995"/>
+  <advance width="993"/>
   <unicode hex="0152"/>
-  <anchor x="557" y="0" name="bottom"/>
-  <anchor x="557" y="694" name="top"/>
+  <anchor x="555" y="0" name="bottom"/>
+  <anchor x="555" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="405" y="-7" type="curve" smooth="yes"/>
-      <point x="459" y="-7"/>
-      <point x="531" y="1"/>
-      <point x="555" y="10" type="curve"/>
-      <point x="515" y="79" type="line"/>
-      <point x="494" y="71"/>
-      <point x="450" y="65"/>
-      <point x="405" y="65" type="curve" smooth="yes"/>
-      <point x="244" y="65"/>
-      <point x="141" y="178"/>
-      <point x="141" y="355" type="curve" smooth="yes"/>
-      <point x="141" y="525"/>
-      <point x="237" y="630"/>
-      <point x="397" y="630" type="curve" smooth="yes"/>
-      <point x="442" y="630"/>
-      <point x="489" y="625"/>
-      <point x="515" y="611" type="curve"/>
-      <point x="555" y="686" type="line"/>
-      <point x="531" y="695"/>
-      <point x="458" y="703"/>
-      <point x="406" y="703" type="curve" smooth="yes"/>
-      <point x="189" y="703"/>
-      <point x="56" y="564"/>
-      <point x="56" y="343" type="curve" smooth="yes"/>
-      <point x="56" y="127"/>
-      <point x="183" y="-7"/>
+      <point x="403" y="-7" type="curve" smooth="yes"/>
+      <point x="457" y="-7"/>
+      <point x="529" y="1"/>
+      <point x="553" y="10" type="curve"/>
+      <point x="513" y="79" type="line"/>
+      <point x="492" y="71"/>
+      <point x="448" y="65"/>
+      <point x="403" y="65" type="curve" smooth="yes"/>
+      <point x="242" y="65"/>
+      <point x="139" y="178"/>
+      <point x="139" y="355" type="curve" smooth="yes"/>
+      <point x="139" y="525"/>
+      <point x="235" y="630"/>
+      <point x="395" y="630" type="curve" smooth="yes"/>
+      <point x="440" y="630"/>
+      <point x="487" y="625"/>
+      <point x="513" y="611" type="curve"/>
+      <point x="553" y="686" type="line"/>
+      <point x="529" y="695"/>
+      <point x="456" y="703"/>
+      <point x="404" y="703" type="curve" smooth="yes"/>
+      <point x="187" y="703"/>
+      <point x="54" y="564"/>
+      <point x="54" y="343" type="curve" smooth="yes"/>
+      <point x="54" y="127"/>
+      <point x="181" y="-7"/>
     </contour>
     <contour>
-      <point x="507" y="0" type="line"/>
-      <point x="590" y="0" type="line"/>
-      <point x="590" y="694" type="line"/>
-      <point x="507" y="694" type="line"/>
+      <point x="505" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="694" type="line"/>
+      <point x="505" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="0" type="line"/>
-      <point x="943" y="0" type="line"/>
-      <point x="943" y="72" type="line"/>
-      <point x="547" y="72" type="line"/>
+      <point x="545" y="0" type="line"/>
+      <point x="941" y="0" type="line"/>
+      <point x="941" y="72" type="line"/>
+      <point x="545" y="72" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="323" type="line"/>
-      <point x="916" y="323" type="line"/>
-      <point x="916" y="395" type="line"/>
-      <point x="547" y="395" type="line"/>
+      <point x="545" y="323" type="line"/>
+      <point x="914" y="323" type="line"/>
+      <point x="914" y="395" type="line"/>
+      <point x="545" y="395" type="line"/>
     </contour>
     <contour>
-      <point x="547" y="622" type="line"/>
-      <point x="943" y="622" type="line"/>
-      <point x="943" y="694" type="line"/>
-      <point x="547" y="694" type="line"/>
+      <point x="545" y="622" type="line"/>
+      <point x="941" y="622" type="line"/>
+      <point x="941" y="694" type="line"/>
+      <point x="545" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_acute.glif b/src/Cantarell-Regular.ufo/glyphs/O_acute.glif
index 20ab7503..c2602e1e 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </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 385b4f7d..57f43c48 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="764"/>
+  <advance width="760"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-63" yOffset="5"/>
+    <component base="_bar-cy" xOffset="-65" 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 f3bd0e1a..fc6b1aca 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="764"/>
+  <advance width="760"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="173"/>
+    <component base="brevecomb.case" xOffset="171"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_caron.glif b/src/Cantarell-Regular.ufo/glyphs/O_caron.glif
index c575c10f..e38880fe 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="764"/>
+  <advance width="760"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="198"/>
+    <component base="caroncomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflex.glif
index 5f8feed3..3a43babe 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexacute.glif
index 05bab67f..063e49ed 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_acutecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_acutecomb.case" xOffset="248" 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 812506d9..135eb879 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="246"/>
-    <component base="circumflexcomb.case" xOffset="194"/>
+    <component base="dotbelowcomb" xOffset="244"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_circumflexgrave.glif
index f8516f58..da3e7964 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_gravecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_gravecomb.case" xOffset="248" 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 9a1962c6..61096423 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_hookabovecomb.case" xOffset="250" yOffset="12"/>
+    <component base="circumflexcomb_hookabovecomb.case" xOffset="248" 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 3a4252f4..fd28cde6 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb_tildecomb.case" xOffset="217" yOffset="12"/>
+    <component base="circumflexcomb_tildecomb.case" xOffset="215" 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 2079a36b..f883be08 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="764"/>
+  <advance width="760"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="161"/>
+    <component base="dblgravecomb.case" xOffset="159"/>
   </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 f07ebc34..5d80ec53 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="764"/>
+  <advance width="760"/>
   <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 4d4ff1bb..740e6245 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="146"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_dieresismacron.glif
index 754b52b4..406a29c6 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="764"/>
+  <advance width="760"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="146"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="144"/>
+    <component base="macroncomb.case" xOffset="138" 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 d8a5b292..838496f6 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="764"/>
+  <advance width="760"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="246"/>
-    <component base="macroncomb.case" xOffset="140" yOffset="162"/>
+    <component base="dotaccentcomb.case" xOffset="244"/>
+    <component base="macroncomb.case" xOffset="138" 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 b6181be3..b7940ba0 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_grave.glif b/src/Cantarell-Regular.ufo/glyphs/O_grave.glif
index a7204a42..1b4aa166 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="187"/>
+    <component base="gravecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hookabove.glif
index 95882c1c..b8ca28ed 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="764"/>
+  <advance width="760"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="238"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horn.glif b/src/Cantarell-Regular.ufo/glyphs/O_horn.glif
index d3b0661f..961390e4 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="764"/>
+  <advance width="760"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="555" yOffset="212"/>
+    <component base="horncomb" xOffset="553" 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 25dcfcb8..cb1f7ca9 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="764"/>
+  <advance width="760"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horndotbelow.glif
index 1f33c2be..666a2f15 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="764"/>
+  <advance width="760"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="246"/>
+    <component base="dotbelowcomb" xOffset="244"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horngrave.glif
index e8054223..7e349e22 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="764"/>
+  <advance width="760"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="187"/>
+    <component base="gravecomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hornhookabove.glif
index 10f41af4..beacdcee 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="764"/>
+  <advance width="760"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="238"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_horntilde.glif
index 4bd4cd11..5afc1418 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="764"/>
+  <advance width="760"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="142"/>
+    <component base="tildecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_hungarumlaut.glif
index eebe0eda..83c8f79b 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="764"/>
+  <advance width="760"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="172"/>
+    <component base="hungarumlautcomb.case" xOffset="170"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_invertedbreve.glif
index e5190a36..1b0da851 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="764"/>
+  <advance width="760"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="185"/>
+    <component base="breveinvertedcomb.case" xOffset="183"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macron.glif b/src/Cantarell-Regular.ufo/glyphs/O_macron.glif
index 782457f2..beca4097 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="764"/>
+  <advance width="760"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="138"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_macronacute.glif
index 6b6e9962..70dc15db 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="764"/>
+  <advance width="760"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="acutecomb.case" xOffset="294" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="138"/>
+    <component base="acutecomb.case" xOffset="292" 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 2e2e7933..f0909174 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="764"/>
+  <advance width="760"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="140"/>
-    <component base="gravecomb.case" xOffset="187" yOffset="163"/>
+    <component base="macroncomb.case" xOffset="138"/>
+    <component base="gravecomb.case" xOffset="185" 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 f5986c8e..00bc5fa1 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="764"/>
+  <advance width="760"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="31"/>
+    <component base="ogonekcomb.tall.case" xOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_slash.glif b/src/Cantarell-Regular.ufo/glyphs/O_slash.glif
index 4cfc1a34..96d34847 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="112" yOffset="-2"/>
+    <component base="slashlongcomb.case" xOffset="110" 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 b7ed96b1..3b0879ea 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="764"/>
+  <advance width="760"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="294"/>
+    <component base="acutecomb.case" xOffset="292"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif b/src/Cantarell-Regular.ufo/glyphs/O_tilde.glif
index 217f533a..02acba2e 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="764"/>
+  <advance width="760"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
+    <component base="tildecomb.case" xOffset="140"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_tildeacute.glif
index e651e850..96e6eb7b 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="764"/>
+  <advance width="760"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="acutecomb.case" xOffset="295" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="acutecomb.case" xOffset="293" 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 56ba098b..e32d2de7 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="764"/>
+  <advance width="760"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="dieresiscomb.case" xOffset="147" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="dieresiscomb.case" xOffset="145" 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 0cf48962..dfde4b5e 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="764"/>
+  <advance width="760"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="142"/>
-    <component base="macroncomb.case" xOffset="141" yOffset="182"/>
+    <component base="tildecomb.case" xOffset="140"/>
+    <component base="macroncomb.case" xOffset="139" 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 e05d5150..f4cd7fcb 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="275"/>
+  <advance width="267"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Y_i-cy.glif
index 268238a2..d7bcf047 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="275"/>
+  <advance width="267"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-98"/>
+    <component base="dieresiscomb.case" xOffset="-102"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/palochka-cy.glif
index e5155f06..99215010 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="275"/>
+  <advance width="267"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>


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