[cantarell-fonts/respacing] Respace extra bold, pass 3



commit 337ced4e7e080db028f6b421fdd7ddd431b9b711
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon Sep 30 00:06:02 2019 +0100

    Respace extra bold, pass 3
    
    Lower-, uppercase, numbers

 src/Cantarell-Bold.ufo/glyphs/A_-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/A_.glif              | 32 ++++----
 src/Cantarell-Bold.ufo/glyphs/A_E_.glif            | 54 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif       |  4 +-
 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    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif    |  6 +-
 .../glyphs/A_brevehookabove.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/A_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif    |  4 +-
 .../glyphs/A_circumflexacute.glif                  |  6 +-
 .../glyphs/A_circumflexdotbelow.glif               |  6 +-
 .../glyphs/A_circumflexgrave.glif                  |  6 +-
 .../glyphs/A_circumflexhookabove.glif              |  6 +-
 .../glyphs/A_circumflextilde.glif                  |  6 +-
 src/Cantarell-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_ie-cy.glif         |  2 +-
 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/B_.glif              | 74 +++++++++---------
 src/Cantarell-Bold.ufo/glyphs/C_.glif              | 58 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/C_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/C_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif  |  6 +-
 src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/D_.glif              | 44 +++++------
 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/D_ze-cy.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_.glif              | 42 +++++-----
 src/Cantarell-Bold.ufo/glyphs/E_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif  |  6 +-
 src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif    |  4 +-
 .../glyphs/E_circumflexacute.glif                  |  6 +-
 .../glyphs/E_circumflexdotbelow.glif               |  6 +-
 .../glyphs/E_circumflexgrave.glif                  |  6 +-
 .../glyphs/E_circumflexhookabove.glif              |  6 +-
 .../glyphs/E_circumflextilde.glif                  |  6 +-
 src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_m-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif   |  6 +-
 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_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif |  2 +-
 src/Cantarell-Bold.ufo/glyphs/E_th.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/E_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/F_.glif              | 30 ++++----
 src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif        |  2 +-
 src/Cantarell-Bold.ufo/glyphs/G_.glif              | 68 ++++++++--------
 src/Cantarell-Bold.ufo/glyphs/G_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/G_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/G_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/H_.glif              | 34 ++++----
 src/Cantarell-Bold.ufo/glyphs/H_a-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_.glif              | 18 ++---
 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_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_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_o-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/I_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/J_.glif              | 36 ++++-----
 src/Cantarell-Bold.ufo/glyphs/J_acute.glif         |  2 +-
 src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/K_.glif              | 28 +++----
 src/Cantarell-Bold.ufo/glyphs/K_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_.glif              | 24 +++---
 src/Cantarell-Bold.ufo/glyphs/L_J_.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_dot.glif           |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_j.glif             |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/L_slash.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/M_.glif              | 38 ++++-----
 src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/N_.glif              | 30 ++++----
 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_.glif              | 64 +++++++--------
 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                  |  6 +-
 .../glyphs/O_circumflexdotbelow.glif               |  6 +-
 .../glyphs/O_circumflexgrave.glif                  |  6 +-
 .../glyphs/O_circumflexhookabove.glif              |  6 +-
 .../glyphs/O_circumflextilde.glif                  |  6 +-
 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_.glif              | 50 ++++++------
 src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/Q_.glif              | 62 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/R_.glif              | 58 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/R_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_.glif              | 70 ++++++++---------
 src/Cantarell-Bold.ufo/glyphs/S_acute.glif         |  4 +-
 .../glyphs/S_acutedotaccent.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/S_altillo.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_caron.glif         |  4 +-
 .../glyphs/S_carondotaccent.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif      |  4 +-
 .../glyphs/S_dotbelowdotaccent.glif                |  6 +-
 src/Cantarell-Bold.ufo/glyphs/T_.glif              | 24 +++---
 src/Cantarell-Bold.ufo/glyphs/T_bar.glif           |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif   |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/T_horn.glif          | 46 +++++------
 src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_.glif              | 46 +++++------
 src/Cantarell-Bold.ufo/glyphs/U_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_breve.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif |  6 +-
 .../glyphs/U_dieresismacron.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horn.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif  |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_macron.glif        |  4 +-
 .../glyphs/U_macrondieresis.glif                   |  6 +-
 src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_ring.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif   |  2 +-
 .../glyphs/U_straightstroke-cy.glif                |  2 +-
 src/Cantarell-Bold.ufo/glyphs/U_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif    |  6 +-
 src/Cantarell-Bold.ufo/glyphs/V_.glif              | 22 +++---
 src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/W_.glif              | 38 ++++-----
 src/Cantarell-Bold.ufo/glyphs/W_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/W_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/W_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/W_e-cy.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/W_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/X_.glif              | 34 ++++----
 src/Cantarell-Bold.ufo/glyphs/Y_.glif              | 28 +++----
 src/Cantarell-Bold.ufo/glyphs/Y_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif    |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_grave.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_macron.glif        |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_.glif              | 30 ++++----
 src/Cantarell-Bold.ufo/glyphs/Z_acute.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_caron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/bar.glif             | 10 +--
 src/Cantarell-Bold.ufo/glyphs/brokenbar.glif       | 18 ++---
 src/Cantarell-Bold.ufo/glyphs/eight.glif           | 90 +++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/five.glif            | 64 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/four.glif            | 26 +++----
 src/Cantarell-Bold.ufo/glyphs/ha-cy.glif           |  2 +-
 src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif      | 30 ++++----
 src/Cantarell-Bold.ufo/glyphs/k.glif               |  2 +-
 src/Cantarell-Bold.ufo/glyphs/kacute.glif          |  2 +-
 src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/nine.glif            |  4 +-
 src/Cantarell-Bold.ufo/glyphs/numero.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/one.glif             |  2 +-
 src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif     |  2 +-
 src/Cantarell-Bold.ufo/glyphs/seven.glif           | 18 ++---
 src/Cantarell-Bold.ufo/glyphs/six.glif             | 78 +++++++++----------
 src/Cantarell-Bold.ufo/glyphs/three.glif           | 86 ++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/two.glif             | 50 ++++++------
 src/Cantarell-Bold.ufo/glyphs/u-cy.glif            |  2 +-
 src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif    |  2 +-
 .../glyphs/uhungarumlaut-cy.glif                   |  2 +-
 src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif      |  2 +-
 src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif       |  2 +-
 src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif    |  2 +-
 .../glyphs/ustraightstroke-cy.glif                 |  2 +-
 src/Cantarell-Bold.ufo/glyphs/v.glif               | 22 +++---
 src/Cantarell-Bold.ufo/glyphs/x.glif               | 30 ++++----
 src/Cantarell-Bold.ufo/glyphs/y.glif               | 26 +++----
 src/Cantarell-Bold.ufo/glyphs/yacute.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif     |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ydieresis.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ydotaccent.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ydotbelow.glif       |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ygrave.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/yhookabove.glif      |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ymacron.glif         |  4 +-
 src/Cantarell-Bold.ufo/glyphs/ytilde.glif          |  4 +-
 src/Cantarell-Bold.ufo/glyphs/zero.glif            | 52 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif    |  2 +-
 src/Cantarell-Bold.ufo/glyphs/zero.zero.glif       |  4 +-
 310 files changed, 1490 insertions(+), 1490 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_-cy.glif
index 881717c0..78de5025 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="705"/>
+  <advance width="703"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_.glif b/src/Cantarell-Bold.ufo/glyphs/A_.glif
index 1e21361c..85836cec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="A" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="0041"/>
   <note>
 A
 </note>
-  <anchor x="357" y="0" name="bottom"/>
-  <anchor x="663" y="10" name="ogonek"/>
-  <anchor x="357" y="694" name="top"/>
+  <anchor x="351" y="0" name="bottom"/>
+  <anchor x="657" y="10" name="ogonek"/>
+  <anchor x="351" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="5" y="0" type="line"/>
-      <point x="190" y="0" type="line"/>
-      <point x="374" y="620" type="line"/>
-      <point x="326" y="620" type="line"/>
-      <point x="519" y="0" type="line"/>
-      <point x="710" y="0" type="line"/>
-      <point x="473" y="694" type="line"/>
-      <point x="252" y="694" type="line"/>
+      <point x="-1" y="0" type="line"/>
+      <point x="184" y="0" type="line"/>
+      <point x="368" y="620" type="line"/>
+      <point x="320" y="620" type="line"/>
+      <point x="513" y="0" type="line"/>
+      <point x="704" y="0" type="line"/>
+      <point x="467" y="694" type="line"/>
+      <point x="246" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="198" y="143" type="line"/>
-      <point x="516" y="143" type="line"/>
-      <point x="480" y="299" type="line"/>
-      <point x="233" y="299" type="line"/>
+      <point x="192" y="143" type="line"/>
+      <point x="510" y="143" type="line"/>
+      <point x="474" y="299" type="line"/>
+      <point x="227" y="299" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
index f4891d85..c5b2ebf4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AE" format="2">
-  <advance width="1018"/>
+  <advance width="1022"/>
   <unicode hex="00C6"/>
-  <anchor x="552" y="0" name="bottom"/>
-  <anchor x="552" y="694" name="top"/>
+  <anchor x="542" y="0" name="bottom"/>
+  <anchor x="542" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="0" y="0" type="line"/>
-      <point x="190" y="0" type="line"/>
-      <point x="580" y="694" type="line"/>
-      <point x="417" y="694" type="line"/>
+      <point x="-10" y="0" type="line"/>
+      <point x="180" y="0" type="line"/>
+      <point x="570" y="694" type="line"/>
+      <point x="407" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="206" y="149" type="line"/>
-      <point x="524" y="149" type="line"/>
-      <point x="524" y="305" type="line"/>
-      <point x="206" y="305" type="line"/>
+      <point x="196" y="149" type="line"/>
+      <point x="514" y="149" type="line"/>
+      <point x="514" y="305" type="line"/>
+      <point x="196" y="305" type="line"/>
     </contour>
     <contour>
-      <point x="484" y="0" type="line"/>
-      <point x="657" y="0" type="line"/>
-      <point x="657" y="694" type="line"/>
-      <point x="484" y="694" type="line"/>
+      <point x="474" y="0" type="line"/>
+      <point x="647" y="0" type="line"/>
+      <point x="647" y="694" type="line"/>
+      <point x="474" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="564" y="0" type="line"/>
-      <point x="982" y="0" type="line"/>
-      <point x="982" y="152" type="line"/>
-      <point x="564" y="152" type="line"/>
+      <point x="554" y="0" type="line"/>
+      <point x="972" y="0" type="line"/>
+      <point x="972" y="152" type="line"/>
+      <point x="554" y="152" type="line"/>
     </contour>
     <contour>
-      <point x="564" y="278" type="line"/>
-      <point x="954" y="278" type="line"/>
-      <point x="954" y="430" type="line"/>
-      <point x="564" y="430" type="line"/>
+      <point x="554" y="278" type="line"/>
+      <point x="944" y="278" type="line"/>
+      <point x="944" y="430" type="line"/>
+      <point x="554" y="430" type="line"/>
     </contour>
     <contour>
-      <point x="564" y="542" type="line"/>
-      <point x="982" y="542" type="line"/>
-      <point x="982" y="694" type="line"/>
-      <point x="564" y="694" type="line"/>
+      <point x="554" y="542" type="line"/>
+      <point x="972" y="542" type="line"/>
+      <point x="972" y="694" type="line"/>
+      <point x="554" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
index e6b9a081..0c9b4d57 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="AEacute" format="2">
-  <advance width="1018"/>
+  <advance width="1022"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acutecomb.case" xOffset="473"/>
+    <component base="acutecomb.case" xOffset="463"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_acute.glif b/src/Cantarell-Bold.ufo/glyphs/A_acute.glif
index 36f4db71..8e7e952a 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acutecomb.case" xOffset="278"/>
+    <component base="acutecomb.case" xOffset="272"/>
   </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 81d34c68..f9391057 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="705"/>
+  <advance width="703"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A-cy"/>
-    <component base="brevecomb-cy.case" xOffset="124"/>
+    <component base="brevecomb-cy.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breve.glif b/src/Cantarell-Bold.ufo/glyphs/A_breve.glif
index 14975b0b..1b5d7001 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="705"/>
+  <advance width="703"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="brevecomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
index 300f6f1d..74d0d3d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_breveacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abreveacute" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="132" yOffset="204"/>
-    <component base="acutecomb.loclVIET" xOffset="271" yOffset="345"/>
+    <component base="brevecomb.loclVIET" xOffset="126" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="265" yOffset="345"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_brevedotbelow.glif
index c269add5..dd9bef90 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="705"/>
+  <advance width="703"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="207"/>
-    <component base="brevecomb.case" xOffset="124"/>
+    <component base="dotbelowcomb" xOffset="201"/>
+    <component base="brevecomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
index ba487994..075e8eaa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevegrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="132" yOffset="204"/>
-    <component base="gravecomb.loclVIET" xOffset="181" yOffset="345"/>
+    <component base="brevecomb.loclVIET" xOffset="126" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="175" yOffset="345"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
index a7c621f6..b2902c37 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevehookabove.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="132" yOffset="204"/>
-    <component base="hookabovecomb.loclVIET" xOffset="204" yOffset="344"/>
+    <component base="brevecomb.loclVIET" xOffset="126" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="198" yOffset="344"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif b/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
index 92dc7e7d..8e2dd90e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_brevetilde.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevecomb.loclVIET" xOffset="132" yOffset="204"/>
-    <component base="tildecomb.loclVIET" xOffset="139" yOffset="344"/>
+    <component base="brevecomb.loclVIET" xOffset="126" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="133" yOffset="344"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_caron.glif b/src/Cantarell-Bold.ufo/glyphs/A_caron.glif
index 92732142..71e6f414 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="705"/>
+  <advance width="703"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caroncomb.case" xOffset="143"/>
+    <component base="caroncomb.case" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/A_circumflex.glif
index ab650ddb..2eb3ebec 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.case" xOffset="158"/>
+    <component base="circumflexcomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
index 4d60981d..d44dac5f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="204"/>
-    <component base="acutecomb.loclVIET" xOffset="448" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="442" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexdotbelow.glif
index b8f2b5ef..b465f4ce 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="705"/>
+  <advance width="703"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="207"/>
-    <component base="circumflexcomb.case" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="201"/>
+    <component base="circumflexcomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
index 500cd7a8..4d84b15a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="204"/>
-    <component base="gravecomb.loclVIET" xOffset="358" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="352" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
index e4f4a468..aba76c75 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="204"/>
-    <component base="hookabovecomb.loclVIET" xOffset="381" yOffset="326"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="375" yOffset="326"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
index ded20da6..c2cfbc89 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_circumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="705"/>
+  <advance width="703"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexcomb.loclVIET" xOffset="153" yOffset="204"/>
-    <component base="tildecomb.loclVIET" xOffset="139" yOffset="344"/>
+    <component base="circumflexcomb.loclVIET" xOffset="147" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="133" yOffset="344"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/A_dblgrave.glif
index ddeff178..ea5df12e 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="705"/>
+  <advance width="703"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecomb.case" xOffset="74"/>
+    <component base="dblgravecomb.case" xOffset="68"/>
   </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 a1a223c7..324c09c0 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="705"/>
+  <advance width="703"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="A-cy"/>
-    <component base="dieresiscomb.case" xOffset="82"/>
+    <component base="dieresiscomb.case" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/A_dieresis.glif
index e091915d..daed5f4f 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C4"/>
   <outline>
     <component base="A"/>
-    <component base="dieresiscomb.case" xOffset="82"/>
+    <component base="dieresiscomb.case" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/A_dotbelow.glif
index 4e44e670..1272aef9 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="705"/>
+  <advance width="703"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelowcomb" xOffset="207"/>
+    <component base="dotbelowcomb" xOffset="201"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_grave.glif b/src/Cantarell-Bold.ufo/glyphs/A_grave.glif
index 055b016d..4f13b398 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="gravecomb.case" xOffset="128"/>
+    <component base="gravecomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/A_hookabove.glif
index f37baec3..87033183 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="705"/>
+  <advance width="703"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hookabovecomb.case" xOffset="202"/>
+    <component base="hookabovecomb.case" xOffset="196"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif b/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
index 6bb41d58..9733c04a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_ie-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Aie-cy" format="2">
-  <advance width="1018"/>
+  <advance width="1022"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_invertedbreve.glif
index 34ad1652..c6f3bd30 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="705"/>
+  <advance width="703"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvertedcomb.case" xOffset="126"/>
+    <component base="breveinvertedcomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_macron.glif b/src/Cantarell-Bold.ufo/glyphs/A_macron.glif
index 43c033f0..1497833d 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="705"/>
+  <advance width="703"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macroncomb.case" xOffset="118"/>
+    <component base="macroncomb.case" xOffset="112"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/A_ogonek.glif
index d7198d30..38f22df3 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="705"/>
+  <advance width="703"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonekcomb" xOffset="203"/>
+    <component base="ogonekcomb" xOffset="197"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ring.glif b/src/Cantarell-Bold.ufo/glyphs/A_ring.glif
index e94ab9af..66f6fc84 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb.case" xOffset="191"/>
+    <component base="ringcomb.case" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif b/src/Cantarell-Bold.ufo/glyphs/A_ringacute.glif
index 43d5e793..2fcf65f3 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="705"/>
+  <advance width="703"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringcomb_acutecomb.case" xOffset="196"/>
+    <component base="ringcomb_acutecomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/A_tilde.glif
index 673a77fb..c7a44f45 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="705"/>
+  <advance width="703"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="tildecomb.case" xOffset="128"/>
+    <component base="tildecomb.case" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_.glif b/src/Cantarell-Bold.ufo/glyphs/B_.glif
index 4de5bad1..94e34743 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_.glif
@@ -1,48 +1,48 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="B" format="2">
-  <advance width="638"/>
+  <advance width="670"/>
   <unicode hex="0042"/>
   <note>
 B
 </note>
-  <anchor x="306" y="0" name="bottom"/>
-  <anchor x="306" y="694" name="top"/>
+  <anchor x="322" y="0" name="bottom"/>
+  <anchor x="322" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="331" y="0" type="line" smooth="yes"/>
-      <point x="506" y="0"/>
-      <point x="622" y="91"/>
-      <point x="622" y="227" type="curve" smooth="yes"/>
-      <point x="622" y="350"/>
-      <point x="533" y="424"/>
-      <point x="382" y="424" type="curve" smooth="yes"/>
-      <point x="168" y="424" type="line"/>
-      <point x="168" y="292" type="line"/>
-      <point x="344" y="292" type="line" smooth="yes"/>
-      <point x="406" y="292"/>
-      <point x="442" y="260"/>
-      <point x="442" y="210" type="curve" smooth="yes"/>
-      <point x="442" y="161"/>
-      <point x="412" y="136"/>
-      <point x="354" y="136" type="curve" smooth="yes"/>
-      <point x="225" y="136" type="line"/>
-      <point x="225" y="558" type="line"/>
-      <point x="293" y="558" type="line" smooth="yes"/>
-      <point x="351" y="558"/>
-      <point x="389" y="530"/>
-      <point x="389" y="488" type="curve" smooth="yes"/>
-      <point x="389" y="450"/>
-      <point x="358" y="418"/>
-      <point x="302" y="401" type="curve"/>
-      <point x="436" y="374" type="line"/>
-      <point x="513" y="394"/>
-      <point x="563" y="457"/>
-      <point x="563" y="531" type="curve" smooth="yes"/>
-      <point x="563" y="638"/>
-      <point x="474" y="694"/>
-      <point x="303" y="694" type="curve" smooth="yes"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="347" y="0" type="line" smooth="yes"/>
+      <point x="522" y="0"/>
+      <point x="638" y="91"/>
+      <point x="638" y="227" type="curve" smooth="yes"/>
+      <point x="638" y="350"/>
+      <point x="549" y="424"/>
+      <point x="398" y="424" type="curve" smooth="yes"/>
+      <point x="184" y="424" type="line"/>
+      <point x="184" y="292" type="line"/>
+      <point x="360" y="292" type="line" smooth="yes"/>
+      <point x="422" y="292"/>
+      <point x="458" y="260"/>
+      <point x="458" y="210" type="curve" smooth="yes"/>
+      <point x="458" y="161"/>
+      <point x="428" y="136"/>
+      <point x="370" y="136" type="curve" smooth="yes"/>
+      <point x="241" y="136" type="line"/>
+      <point x="241" y="558" type="line"/>
+      <point x="309" y="558" type="line" smooth="yes"/>
+      <point x="367" y="558"/>
+      <point x="405" y="530"/>
+      <point x="405" y="488" type="curve" smooth="yes"/>
+      <point x="405" y="450"/>
+      <point x="374" y="418"/>
+      <point x="318" y="401" type="curve"/>
+      <point x="452" y="374" type="line"/>
+      <point x="529" y="394"/>
+      <point x="579" y="457"/>
+      <point x="579" y="531" type="curve" smooth="yes"/>
+      <point x="579" y="638"/>
+      <point x="490" y="694"/>
+      <point x="319" y="694" type="curve" smooth="yes"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_.glif b/src/Cantarell-Bold.ufo/glyphs/C_.glif
index 1e68ba24..50ec393b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="C" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="0043"/>
   <note>
 C
 </note>
-  <anchor x="347" y="0" name="bottom"/>
-  <anchor x="347" y="694" name="top"/>
+  <anchor x="360" y="0" name="bottom"/>
+  <anchor x="360" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="381" y="-10" type="curve" smooth="yes"/>
-      <point x="456" y="-10"/>
-      <point x="542" y="10"/>
-      <point x="595" y="39" type="curve"/>
-      <point x="557" y="164" type="line"/>
-      <point x="517" y="150"/>
-      <point x="466" y="142"/>
-      <point x="423" y="142" type="curve" smooth="yes"/>
-      <point x="284" y="142"/>
-      <point x="204" y="224"/>
-      <point x="204" y="359" type="curve" smooth="yes"/>
-      <point x="204" y="486"/>
-      <point x="275" y="551"/>
-      <point x="401" y="551" type="curve" smooth="yes"/>
-      <point x="455" y="551"/>
-      <point x="518" y="541"/>
-      <point x="556" y="525" type="curve"/>
-      <point x="604" y="661" type="line"/>
-      <point x="537" y="690"/>
-      <point x="472" y="704"/>
-      <point x="403" y="704" type="curve" smooth="yes"/>
-      <point x="180" y="704"/>
-      <point x="24" y="560"/>
-      <point x="24" y="342" type="curve" smooth="yes"/>
-      <point x="24" y="131"/>
-      <point x="170" y="-10"/>
+      <point x="394" y="-10" type="curve" smooth="yes"/>
+      <point x="469" y="-10"/>
+      <point x="555" y="10"/>
+      <point x="608" y="39" type="curve"/>
+      <point x="570" y="164" type="line"/>
+      <point x="530" y="150"/>
+      <point x="479" y="142"/>
+      <point x="436" y="142" type="curve" smooth="yes"/>
+      <point x="297" y="142"/>
+      <point x="217" y="224"/>
+      <point x="217" y="359" type="curve" smooth="yes"/>
+      <point x="217" y="486"/>
+      <point x="288" y="551"/>
+      <point x="414" y="551" type="curve" smooth="yes"/>
+      <point x="468" y="551"/>
+      <point x="531" y="541"/>
+      <point x="569" y="525" type="curve"/>
+      <point x="617" y="661" type="line"/>
+      <point x="550" y="690"/>
+      <point x="485" y="704"/>
+      <point x="416" y="704" type="curve" smooth="yes"/>
+      <point x="193" y="704"/>
+      <point x="37" y="560"/>
+      <point x="37" y="342" type="curve" smooth="yes"/>
+      <point x="37" y="131"/>
+      <point x="183" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
index 6c623cc9..257af0ec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cacute" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="0106"/>
   <outline>
     <component base="C"/>
-    <component base="acutecomb.case" xOffset="268"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
index d4073a57..8770648a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccaron" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="010C"/>
   <outline>
     <component base="C"/>
-    <component base="caroncomb.case" xOffset="133"/>
+    <component base="caroncomb.case" xOffset="146"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
index 3c4d06dc..98564b98 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedilla" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="00C7"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="189"/>
+    <component base="cedillacomb" xOffset="202"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
index d33030b9..0483283e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_cedillaacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccedillaacute" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="1E08"/>
   <outline>
     <component base="C"/>
-    <component base="cedillacomb" xOffset="189"/>
-    <component base="acutecomb.case" xOffset="268"/>
+    <component base="cedillacomb" xOffset="202"/>
+    <component base="acutecomb.case" xOffset="281"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
index f2368633..de54b30c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ccircumflex" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="0108"/>
   <outline>
     <component base="C"/>
-    <component base="circumflexcomb.case" xOffset="148"/>
+    <component base="circumflexcomb.case" xOffset="161"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
index 13e887c0..5176f221 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Cdotaccent" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="010A"/>
   <outline>
     <component base="C"/>
-    <component base="dotaccentcomb.case" xOffset="202"/>
+    <component base="dotaccentcomb.case" xOffset="215"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_.glif b/src/Cantarell-Bold.ufo/glyphs/D_.glif
index 589a5141..beeb2587 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="D" format="2">
-  <advance width="721"/>
+  <advance width="750"/>
   <unicode hex="0044"/>
   <note>
 D
 </note>
-  <anchor x="346" y="0" name="bottom"/>
-  <anchor x="164" y="344" name="center"/>
-  <anchor x="323" y="694" name="top"/>
+  <anchor x="362" y="0" name="bottom"/>
+  <anchor x="180" y="344" name="center"/>
+  <anchor x="339" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="302" y="0" type="line" smooth="yes"/>
-      <point x="540" y="0"/>
-      <point x="697" y="143"/>
-      <point x="697" y="361" type="curve" smooth="yes"/>
-      <point x="697" y="570"/>
-      <point x="555" y="694"/>
-      <point x="315" y="694" type="curve" smooth="yes"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="318" y="0" type="line" smooth="yes"/>
+      <point x="556" y="0"/>
+      <point x="713" y="143"/>
+      <point x="713" y="361" type="curve" smooth="yes"/>
+      <point x="713" y="570"/>
+      <point x="571" y="694"/>
+      <point x="331" y="694" type="curve" smooth="yes"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="149" type="line"/>
-      <point x="225" y="545" type="line"/>
-      <point x="305" y="545" type="line" smooth="yes"/>
-      <point x="438" y="545"/>
-      <point x="517" y="469"/>
-      <point x="517" y="341" type="curve" smooth="yes"/>
-      <point x="517" y="217"/>
-      <point x="448" y="149"/>
-      <point x="322" y="149" type="curve" smooth="yes"/>
+      <point x="241" y="149" type="line"/>
+      <point x="241" y="545" type="line"/>
+      <point x="321" y="545" type="line" smooth="yes"/>
+      <point x="454" y="545"/>
+      <point x="533" y="469"/>
+      <point x="533" y="341" type="curve" smooth="yes"/>
+      <point x="533" y="217"/>
+      <point x="464" y="149"/>
+      <point x="338" y="149" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_Z_caron.glif
index 916e45b8..2dccafaf 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="1367"/>
+  <advance width="1408"/>
   <unicode hex="01C4"/>
   <outline>
     <component base="D"/>
-    <component base="Zcaron" xOffset="721"/>
+    <component base="Zcaron" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_caron.glif b/src/Cantarell-Bold.ufo/glyphs/D_caron.glif
index 31078020..076ba1d8 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="721"/>
+  <advance width="750"/>
   <unicode hex="010E"/>
   <outline>
     <component base="D"/>
-    <component base="caroncomb.case" xOffset="109"/>
+    <component base="caroncomb.case" xOffset="125"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_croat.glif b/src/Cantarell-Bold.ufo/glyphs/D_croat.glif
index 7d8196d4..ae04a622 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="721"/>
+  <advance width="750"/>
   <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 d872f1a1..e531912b 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="721"/>
+  <advance width="750"/>
   <unicode hex="1E0C"/>
   <outline>
     <component base="D"/>
-    <component base="dotbelowcomb" xOffset="196"/>
+    <component base="dotbelowcomb" xOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/D_linebelow.glif
index 694309a5..1a86b5dc 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="721"/>
+  <advance width="750"/>
   <unicode hex="1E0E"/>
   <outline>
     <component base="D"/>
-    <component base="macronbelowcomb" xOffset="101"/>
+    <component base="macronbelowcomb" xOffset="117"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif b/src/Cantarell-Bold.ufo/glyphs/D_zcaron.glif
index f339c5c0..cefe137e 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="1236"/>
+  <advance width="1265"/>
   <unicode hex="01C5"/>
   <outline>
     <component base="D"/>
-    <component base="zcaron" xOffset="721"/>
+    <component base="zcaron" xOffset="750"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif b/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif
index 1f225950..f4351ae9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_ze-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Dze-cy" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="0405"/>
   <outline>
     <component base="S"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_.glif b/src/Cantarell-Bold.ufo/glyphs/E_.glif
index 146c38d9..a3dd6533 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="E" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0045"/>
   <note>
 E
 </note>
-  <anchor x="308" y="0" name="bottom"/>
-  <anchor x="506" y="10" name="ogonek"/>
-  <anchor x="301" y="694" name="top"/>
-  <anchor x="3" y="694" name="topleft"/>
+  <anchor x="324" y="0" name="bottom"/>
+  <anchor x="522" y="10" name="ogonek"/>
+  <anchor x="317" y="694" name="top"/>
+  <anchor x="19" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="0" type="line"/>
-      <point x="553" y="0" type="line"/>
-      <point x="553" y="152" type="line"/>
-      <point x="135" y="152" type="line"/>
+      <point x="151" y="0" type="line"/>
+      <point x="569" y="0" type="line"/>
+      <point x="569" y="152" type="line"/>
+      <point x="151" y="152" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="276" type="line"/>
-      <point x="525" y="276" type="line"/>
-      <point x="525" y="428" type="line"/>
-      <point x="135" y="428" type="line"/>
+      <point x="151" y="276" type="line"/>
+      <point x="541" y="276" type="line"/>
+      <point x="541" y="428" type="line"/>
+      <point x="151" y="428" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="542" type="line"/>
-      <point x="553" y="542" type="line"/>
-      <point x="553" y="694" type="line"/>
-      <point x="135" y="694" type="line"/>
+      <point x="151" y="542" type="line"/>
+      <point x="569" y="542" type="line"/>
+      <point x="569" y="694" type="line"/>
+      <point x="151" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
index 8284b997..6bccc4c4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eacute" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="00C9"/>
   <outline>
     <component base="E"/>
-    <component base="acutecomb.case" xOffset="222"/>
+    <component base="acutecomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
index 43137b19..7af2b5e2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ebreve" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0114"/>
   <outline>
     <component base="E"/>
-    <component base="brevecomb.case" xOffset="68"/>
+    <component base="brevecomb.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
index 7207d73a..061feb34 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecaron" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="011A"/>
   <outline>
     <component base="E"/>
-    <component base="caroncomb.case" xOffset="87"/>
+    <component base="caroncomb.case" xOffset="103"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
index df89cae4..62f7437b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_cedillabreve.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecedillabreve" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1E1C"/>
   <outline>
     <component base="E"/>
-    <component base="cedillacomb" xOffset="150"/>
-    <component base="brevecomb.case" xOffset="68"/>
+    <component base="cedillacomb" xOffset="166"/>
+    <component base="brevecomb.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
index c905f77e..88b5fcff 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflex" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="00CA"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.case" xOffset="102"/>
+    <component base="circumflexcomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
index 17ba04b0..fcff2782 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexacute" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EBE"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="97" yOffset="204"/>
-    <component base="acutecomb.loclVIET" xOffset="392" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="408" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
index 2e9d75f9..463b11f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexdotbelow" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EC6"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="158"/>
-    <component base="circumflexcomb.case" xOffset="102"/>
+    <component base="dotbelowcomb" xOffset="174"/>
+    <component base="circumflexcomb.case" xOffset="118"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
index 153d8e97..800bc680 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexgrave" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EC0"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="97" yOffset="204"/>
-    <component base="gravecomb.loclVIET" xOffset="302" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="318" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
index 5ad7d94a..7c32500d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflexhookabove" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EC2"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="97" yOffset="204"/>
-    <component base="hookabovecomb.loclVIET" xOffset="325" yOffset="326"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="341" yOffset="326"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
index 613077f9..31bc8387 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_circumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ecircumflextilde" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EC4"/>
   <outline>
     <component base="E"/>
-    <component base="circumflexcomb.loclVIET" xOffset="97" yOffset="204"/>
-    <component base="tildecomb.loclVIET" xOffset="83" yOffset="344"/>
+    <component base="circumflexcomb.loclVIET" xOffset="113" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="99" yOffset="344"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
index 9777ba78..712b3ba1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edblgrave" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0204"/>
   <outline>
     <component base="E"/>
-    <component base="dblgravecomb.case" xOffset="18"/>
+    <component base="dblgravecomb.case" xOffset="34"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
index ee75ec48..90ea3bb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edieresis" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="00CB"/>
   <outline>
     <component base="E"/>
-    <component base="dieresiscomb.case" xOffset="26"/>
+    <component base="dieresiscomb.case" xOffset="42"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
index 0fa7d6a3..06220526 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotaccent" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0116"/>
   <outline>
     <component base="E"/>
-    <component base="dotaccentcomb.case" xOffset="156"/>
+    <component base="dotaccentcomb.case" xOffset="172"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
index 83290ceb..59a9fbe9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Edotbelow" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EB8"/>
   <outline>
     <component base="E"/>
-    <component base="dotbelowcomb" xOffset="158"/>
+    <component base="dotbelowcomb" xOffset="174"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
index 6a146d2a..be695e7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Egrave" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="00C8"/>
   <outline>
     <component base="E"/>
-    <component base="gravecomb.case" xOffset="72"/>
+    <component base="gravecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
index 05e0dc25..24a0a850 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ehookabove" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EBA"/>
   <outline>
     <component base="E"/>
-    <component base="hookabovecomb.case" xOffset="146"/>
+    <component base="hookabovecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
index 3ae3ddc5..936ad300 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Einvertedbreve" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0206"/>
   <outline>
     <component base="E"/>
-    <component base="breveinvertedcomb.case" xOffset="70"/>
+    <component base="breveinvertedcomb.case" xOffset="86"/>
   </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 7f078b79..98550331 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="868"/>
+  <advance width="900"/>
   <unicode hex="041C"/>
   <outline>
     <component base="M"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
index 1499451b..f95e5baf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacron" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0112"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="62"/>
+    <component base="macroncomb.case" xOffset="78"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
index 56e3a023..5380858d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macronacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacronacute" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1E16"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="62"/>
-    <component base="acutecomb.case" xOffset="222" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="78"/>
+    <component base="acutecomb.case" xOffset="238" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
index c8f9ff5f..f84abb80 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_macrongrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Emacrongrave" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1E14"/>
   <outline>
     <component base="E"/>
-    <component base="macroncomb.case" xOffset="62"/>
-    <component base="gravecomb.case" xOffset="72" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="78"/>
+    <component base="gravecomb.case" xOffset="88" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_n-cy.glif
index 9736674a..cba2ea51 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="731"/>
+  <advance width="763"/>
   <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 4a6275ab..b5bc832d 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="761"/>
+  <advance width="793"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="71" y="0" type="line"/>
+      <point x="234" y="0" type="line"/>
+      <point x="234" y="470" type="line"/>
+      <point x="222" y="460" type="line"/>
+      <point x="570" y="-37" type="line"/>
+      <point x="722" y="0" type="line"/>
+      <point x="722" y="694" type="line"/>
+      <point x="559" y="694" type="line"/>
+      <point x="557" y="216" type="line"/>
+      <point x="578" y="219" type="line"/>
+      <point x="263" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="559" y="-243" type="line"/>
+      <point x="663" y="-213"/>
+      <point x="722" y="-121"/>
+      <point x="722" y="-13" type="curve" smooth="yes"/>
+      <point x="722" y="0" type="line"/>
+      <point x="559" y="0" type="line"/>
+      <point x="559" y="-25" type="line" smooth="yes"/>
+      <point x="559" y="-82"/>
+      <point x="539" y="-127"/>
+      <point x="504" y="-147" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
index 0de00719..b7a00ba4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ogonek.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eogonek" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0118"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
     <component base="E"/>
-    <component base="ogonekcomb" xOffset="46"/>
+    <component base="ogonekcomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
index 443732f8..4dcf8cc6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_r-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Er-cy" format="2">
-  <advance width="609"/>
+  <advance width="625"/>
   <unicode hex="0420"/>
   <outline>
     <component base="P"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
index c5e83d4e..c3b5fddc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_s-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Es-cy" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="0421"/>
   <anchor x="342" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
index c439062f..02774e76 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_sdescender-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Esdescender-cy" format="2">
-  <advance width="616"/>
+  <advance width="636"/>
   <unicode hex="04AA"/>
   <outline>
     <component base="Es-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_th.glif b/src/Cantarell-Bold.ufo/glyphs/E_th.glif
index 1e84b030..498f6604 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="721"/>
+  <advance width="750"/>
   <unicode hex="00D0"/>
   <outline>
     <component base="D"/>
-    <component base="strokeshortcomb.case" xOffset="-51" yOffset="46"/>
+    <component base="strokeshortcomb.case" xOffset="-35" yOffset="46"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
index 6e4eb40d..4f36283a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etilde" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="1EBC"/>
   <outline>
     <component base="E"/>
-    <component base="tildecomb.case" xOffset="72"/>
+    <component base="tildecomb.case" xOffset="88"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_.glif b/src/Cantarell-Bold.ufo/glyphs/F_.glif
index 21709135..cdda85cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/F_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="F" format="2">
-  <advance width="572"/>
+  <advance width="595"/>
   <unicode hex="0046"/>
   <note>
 F
 </note>
-  <anchor x="159" y="0" name="bottom"/>
-  <anchor x="266" y="694" name="top"/>
+  <anchor x="175" y="0" name="bottom"/>
+  <anchor x="282" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="257" type="line"/>
-      <point x="514" y="257" type="line"/>
-      <point x="514" y="409" type="line"/>
-      <point x="135" y="409" type="line"/>
+      <point x="151" y="257" type="line"/>
+      <point x="530" y="257" type="line"/>
+      <point x="530" y="409" type="line"/>
+      <point x="151" y="409" type="line"/>
     </contour>
     <contour>
-      <point x="135" y="542" type="line"/>
-      <point x="550" y="542" type="line"/>
-      <point x="550" y="694" type="line"/>
-      <point x="135" y="694" type="line"/>
+      <point x="151" y="542" type="line"/>
+      <point x="566" y="542" type="line"/>
+      <point x="566" y="694" type="line"/>
+      <point x="151" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif b/src/Cantarell-Bold.ufo/glyphs/F_ita-cy.glif
index 0d49a829..82f28af6 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="756"/>
+  <advance width="782"/>
   <unicode hex="0472"/>
   <outline>
     <component base="Obarred-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_.glif b/src/Cantarell-Bold.ufo/glyphs/G_.glif
index 92010588..bd8319c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="G" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="0047"/>
   <note>
 G
 </note>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
+  <anchor x="363" y="0" name="bottom"/>
+  <anchor x="383" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="388" y="-10" type="curve" smooth="yes"/>
-      <point x="498" y="-10"/>
-      <point x="592" y="23"/>
-      <point x="670" y="89" type="curve"/>
-      <point x="670" y="411" type="line"/>
-      <point x="358" y="411" type="line"/>
-      <point x="358" y="265" type="line"/>
-      <point x="505" y="265" type="line"/>
-      <point x="505" y="79" type="line"/>
-      <point x="531" y="180" type="line"/>
-      <point x="508" y="155"/>
-      <point x="464" y="140"/>
-      <point x="409" y="140" type="curve" smooth="yes"/>
-      <point x="284" y="140"/>
-      <point x="206" y="221"/>
-      <point x="206" y="353" type="curve" smooth="yes"/>
-      <point x="206" y="482"/>
-      <point x="281" y="551"/>
-      <point x="422" y="551" type="curve" smooth="yes"/>
-      <point x="481" y="551"/>
-      <point x="550" y="540"/>
-      <point x="596" y="524" type="curve"/>
-      <point x="644" y="660" type="line"/>
-      <point x="585" y="688"/>
-      <point x="506" y="704"/>
-      <point x="427" y="704" type="curve" smooth="yes"/>
-      <point x="181" y="704"/>
-      <point x="24" y="556"/>
-      <point x="24" y="339" type="curve" smooth="yes"/>
-      <point x="24" y="130"/>
-      <point x="170" y="-10"/>
+      <point x="401" y="-10" type="curve" smooth="yes"/>
+      <point x="511" y="-10"/>
+      <point x="605" y="23"/>
+      <point x="683" y="89" type="curve"/>
+      <point x="683" y="411" type="line"/>
+      <point x="371" y="411" type="line"/>
+      <point x="371" y="265" type="line"/>
+      <point x="518" y="265" type="line"/>
+      <point x="518" y="79" type="line"/>
+      <point x="544" y="180" type="line"/>
+      <point x="521" y="155"/>
+      <point x="477" y="140"/>
+      <point x="422" y="140" type="curve" smooth="yes"/>
+      <point x="297" y="140"/>
+      <point x="219" y="221"/>
+      <point x="219" y="353" type="curve" smooth="yes"/>
+      <point x="219" y="482"/>
+      <point x="294" y="551"/>
+      <point x="435" y="551" type="curve" smooth="yes"/>
+      <point x="494" y="551"/>
+      <point x="563" y="540"/>
+      <point x="609" y="524" type="curve"/>
+      <point x="657" y="660" type="line"/>
+      <point x="598" y="688"/>
+      <point x="519" y="704"/>
+      <point x="440" y="704" type="curve" smooth="yes"/>
+      <point x="194" y="704"/>
+      <point x="37" y="556"/>
+      <point x="37" y="339" type="curve" smooth="yes"/>
+      <point x="37" y="130"/>
+      <point x="183" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
index 2b028edd..92144582 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gbreve" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="011E"/>
   <outline>
     <component base="G"/>
-    <component base="brevecomb.case" xOffset="137"/>
+    <component base="brevecomb.case" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
index fe21097d..330cdd7e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcaron" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="01E6"/>
   <outline>
     <component base="G"/>
-    <component base="caroncomb.case" xOffset="156"/>
+    <component base="caroncomb.case" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
index b2fe87a5..a6ebbb0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcircumflex" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="011C"/>
   <outline>
     <component base="G"/>
-    <component base="circumflexcomb.case" xOffset="171"/>
+    <component base="circumflexcomb.case" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
index a9cd6df6..0f72d273 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gcommaaccent" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="0122"/>
   <outline>
     <component base="G"/>
-    <component base="commaaccentcomb" xOffset="232"/>
+    <component base="commaaccentcomb" xOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
index 0a89eb8c..62216cae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gdotaccent" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="0120"/>
   <outline>
     <component base="G"/>
-    <component base="dotaccentcomb.case" xOffset="225"/>
+    <component base="dotaccentcomb.case" xOffset="238"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
index 84155394..95b6a86f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gmacron" format="2">
-  <advance width="708"/>
+  <advance width="730"/>
   <unicode hex="1E20"/>
   <outline>
     <component base="G"/>
-    <component base="macroncomb.case" xOffset="131"/>
+    <component base="macroncomb.case" xOffset="144"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_.glif b/src/Cantarell-Bold.ufo/glyphs/H_.glif
index 84cbc61c..1d9cc269 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="H" format="2">
-  <advance width="731"/>
+  <advance width="763"/>
   <unicode hex="0048"/>
   <note>
 H
 </note>
-  <anchor x="365" y="0" name="bottom"/>
-  <anchor x="365" y="566" name="center"/>
-  <anchor x="365" y="694" name="top"/>
-  <anchor x="-5" y="694" name="topleft"/>
+  <anchor x="381" y="0" name="bottom"/>
+  <anchor x="381" y="566" name="center"/>
+  <anchor x="381" y="694" name="top"/>
+  <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="500" y="0" type="line"/>
-      <point x="676" y="0" type="line"/>
-      <point x="676" y="694" type="line"/>
-      <point x="500" y="694" type="line"/>
+      <point x="516" y="0" type="line"/>
+      <point x="692" y="0" type="line"/>
+      <point x="692" y="694" type="line"/>
+      <point x="516" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="210" y="274" type="line"/>
-      <point x="520" y="274" type="line"/>
-      <point x="520" y="430" type="line"/>
-      <point x="210" y="430" type="line"/>
+      <point x="226" y="274" type="line"/>
+      <point x="536" y="274" type="line"/>
+      <point x="536" y="430" type="line"/>
+      <point x="226" y="430" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
index 317970f4..6e7db53c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ha-cy" format="2">
-  <advance width="674"/>
+  <advance width="652"/>
   <unicode hex="0425"/>
   <anchor x="532" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_bar.glif b/src/Cantarell-Bold.ufo/glyphs/H_bar.glif
index 5acde17f..0707cc0e 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="731"/>
+  <advance width="763"/>
   <unicode hex="0126"/>
   <outline>
     <component base="H"/>
-    <component base="strokelongcomb" xOffset="-75" yOffset="223"/>
+    <component base="strokelongcomb" xOffset="-59" 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 f7372d07..4826d557 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="731"/>
+  <advance width="763"/>
   <unicode hex="1E2A"/>
   <outline>
     <component base="H"/>
-    <component base="brevebelowcomb" xOffset="132"/>
+    <component base="brevebelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/H_circumflex.glif
index 11983870..26fd448f 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="731"/>
+  <advance width="763"/>
   <unicode hex="0124"/>
   <outline>
     <component base="H"/>
-    <component base="circumflexcomb.case" xOffset="166"/>
+    <component base="circumflexcomb.case" xOffset="182"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/H_dotbelow.glif
index 975c6a4d..3c9d6c92 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="731"/>
+  <advance width="763"/>
   <unicode hex="1E24"/>
   <outline>
     <component base="H"/>
-    <component base="dotbelowcomb" xOffset="215"/>
+    <component base="dotbelowcomb" xOffset="231"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_-cy.glif
index 79c4242f..90ac2d6d 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="286"/>
+  <advance width="318"/>
   <unicode hex="0406"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_.glif b/src/Cantarell-Bold.ufo/glyphs/I_.glif
index 04a9d34c..c5e339a9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_.glif
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="I" format="2">
-  <advance width="286"/>
+  <advance width="318"/>
   <unicode hex="0049"/>
   <note>
 I
 </note>
-  <anchor x="143" y="0" name="bottom"/>
-  <anchor x="184" y="10" name="ogonek"/>
-  <anchor x="143" y="694" name="top"/>
-  <anchor x="12" y="694" name="topleft"/>
+  <anchor x="159" y="0" name="bottom"/>
+  <anchor x="200" y="10" name="ogonek"/>
+  <anchor x="159" y="694" name="top"/>
+  <anchor x="28" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="231" y="0" type="line"/>
-      <point x="231" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_acute.glif b/src/Cantarell-Bold.ufo/glyphs/I_acute.glif
index a255b185..2ced8b61 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="286"/>
+  <advance width="318"/>
   <unicode hex="00CD"/>
   <outline>
     <component base="I"/>
-    <component base="acutecomb.case" xOffset="64"/>
+    <component base="acutecomb.case" xOffset="80"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_breve.glif b/src/Cantarell-Bold.ufo/glyphs/I_breve.glif
index 2a74447f..fa60373b 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="286"/>
+  <advance width="318"/>
   <unicode hex="012C"/>
   <outline>
     <component base="I"/>
-    <component base="brevecomb.case" xOffset="-90"/>
+    <component base="brevecomb.case" xOffset="-74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_caron.glif b/src/Cantarell-Bold.ufo/glyphs/I_caron.glif
index 03c2bd0f..d158df9b 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="286"/>
+  <advance width="318"/>
   <unicode hex="01CF"/>
   <outline>
     <component base="I"/>
-    <component base="caroncomb.case" xOffset="-71"/>
+    <component base="caroncomb.case" xOffset="-55"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/I_circumflex.glif
index b80fb4b0..4e5208bc 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="286"/>
+  <advance width="318"/>
   <unicode hex="00CE"/>
   <outline>
     <component base="I"/>
-    <component base="circumflexcomb.case" xOffset="-56"/>
+    <component base="circumflexcomb.case" xOffset="-40"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/I_dblgrave.glif
index c344eece..266492bd 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="286"/>
+  <advance width="318"/>
   <unicode hex="0208"/>
   <outline>
     <component base="I"/>
-    <component base="dblgravecomb.case" xOffset="-140"/>
+    <component base="dblgravecomb.case" xOffset="-124"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/I_dieresis.glif
index 4e88497f..99c45521 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="286"/>
+  <advance width="318"/>
   <unicode hex="00CF"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-132"/>
+    <component base="dieresiscomb.case" xOffset="-116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_dieresisacute.glif
index 5d82be4b..3ece9c25 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="286"/>
+  <advance width="318"/>
   <unicode hex="1E2E"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-132"/>
-    <component base="acutecomb.case" xOffset="64" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="-116"/>
+    <component base="acutecomb.case" xOffset="80" 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 d8e10932..7650278d 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="286"/>
+  <advance width="318"/>
   <unicode hex="0130"/>
   <outline>
     <component base="I"/>
-    <component base="dotaccentcomb.case" xOffset="-2"/>
+    <component base="dotaccentcomb.case" xOffset="14"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/I_dotbelow.glif
index a2999dc5..fb52128e 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="286"/>
+  <advance width="318"/>
   <unicode hex="1ECA"/>
   <outline>
     <component base="I"/>
-    <component base="dotbelowcomb" xOffset="-7"/>
+    <component base="dotbelowcomb" xOffset="9"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
index 9f4f87ae..0eb91bc2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ie-cy" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0415"/>
   <anchor x="305" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
index f306b3ee..c661889f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ebreve-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iebreve-cy" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="04D6"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
index c5cfc29f..2fe9d5f3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_egrave-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iegrave-cy" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0400"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_grave.glif b/src/Cantarell-Bold.ufo/glyphs/I_grave.glif
index 329a1ad2..903304f4 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="286"/>
+  <advance width="318"/>
   <unicode hex="00CC"/>
   <outline>
     <component base="I"/>
-    <component base="gravecomb.case" xOffset="-86"/>
+    <component base="gravecomb.case" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/I_hookabove.glif
index 8ba985e9..f4dd0161 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="286"/>
+  <advance width="318"/>
   <unicode hex="1EC8"/>
   <outline>
     <component base="I"/>
-    <component base="hookabovecomb.case" xOffset="-12"/>
+    <component base="hookabovecomb.case" xOffset="4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_invertedbreve.glif
index ae65e158..a188feb6 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="286"/>
+  <advance width="318"/>
   <unicode hex="020A"/>
   <outline>
     <component base="I"/>
-    <component base="breveinvertedcomb.case" xOffset="-88"/>
+    <component base="breveinvertedcomb.case" xOffset="-72"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_macron.glif b/src/Cantarell-Bold.ufo/glyphs/I_macron.glif
index 252f37b0..ffea0a30 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="286"/>
+  <advance width="318"/>
   <unicode hex="012A"/>
   <outline>
     <component base="I"/>
-    <component base="macroncomb.narrow.case" xOffset="-67"/>
+    <component base="macroncomb.narrow.case" xOffset="-51"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
index adeb8397..dedb7d85 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_o-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Io-cy" format="2">
-  <advance width="589"/>
+  <advance width="619"/>
   <unicode hex="0401"/>
   <outline>
     <component base="Ie-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/I_ogonek.glif
index d82d3864..7191f74b 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="286"/>
+  <advance width="318"/>
   <unicode hex="012E"/>
   <outline>
     <component base="I"/>
-    <component base="ogonekcomb.narrow" xOffset="-251"/>
+    <component base="ogonekcomb.narrow" xOffset="-235"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/I_tilde.glif
index 458c8c0a..4c7d14e1 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="286"/>
+  <advance width="318"/>
   <unicode hex="0128"/>
   <outline>
     <component base="I"/>
-    <component base="tildecomb.case" xOffset="-86"/>
+    <component base="tildecomb.case" xOffset="-70"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_.glif b/src/Cantarell-Bold.ufo/glyphs/J_.glif
index 1f8859c7..067d8209 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_.glif
@@ -5,26 +5,26 @@
   <note>
 J
 </note>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="310" y="694" name="top"/>
+  <anchor x="223" y="0" name="bottom"/>
+  <anchor x="299" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="158" y="-10" type="curve" smooth="yes"/>
-      <point x="311" y="-10"/>
-      <point x="399" y="83"/>
-      <point x="399" y="243" type="curve" smooth="yes"/>
-      <point x="399" y="694" type="line"/>
-      <point x="225" y="694" type="line"/>
-      <point x="225" y="233" type="line" smooth="yes"/>
-      <point x="225" y="173"/>
-      <point x="197" y="143"/>
-      <point x="142" y="143" type="curve" smooth="yes"/>
-      <point x="114" y="143"/>
-      <point x="79" y="151"/>
-      <point x="53" y="162" type="curve"/>
-      <point x="4" y="26" type="line"/>
-      <point x="48" y="2"/>
-      <point x="101" y="-10"/>
+      <point x="147" y="-10" type="curve" smooth="yes"/>
+      <point x="300" y="-10"/>
+      <point x="388" y="83"/>
+      <point x="388" y="243" type="curve" smooth="yes"/>
+      <point x="388" y="694" type="line"/>
+      <point x="214" y="694" type="line"/>
+      <point x="214" y="233" type="line" smooth="yes"/>
+      <point x="214" y="173"/>
+      <point x="186" y="143"/>
+      <point x="131" y="143" type="curve" smooth="yes"/>
+      <point x="103" y="143"/>
+      <point x="68" y="151"/>
+      <point x="42" y="162" type="curve"/>
+      <point x="-7" y="26" type="line"/>
+      <point x="37" y="2"/>
+      <point x="90" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_acute.glif b/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
index a338f286..1ded9dd9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_acute.glif
@@ -3,6 +3,6 @@
   <advance width="447"/>
   <outline>
     <component base="J"/>
-    <component base="acutecomb.case" xOffset="231"/>
+    <component base="acutecomb.case" xOffset="220"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
index 27f22f83..aed5c34f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/J_circumflex.glif
@@ -4,6 +4,6 @@
   <unicode hex="0134"/>
   <outline>
     <component base="J"/>
-    <component base="circumflexcomb.case" xOffset="111"/>
+    <component base="circumflexcomb.case" xOffset="100"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_.glif b/src/Cantarell-Bold.ufo/glyphs/K_.glif
index 9f202c3b..33d1bf4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="K" format="2">
-  <advance width="670"/>
+  <advance width="691"/>
   <unicode hex="004B"/>
   <note>
 K
 </note>
-  <anchor x="325" y="0" name="bottom"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="341" y="0" name="bottom"/>
+  <anchor x="341" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="453" y="0" type="line"/>
-      <point x="685" y="0" type="line"/>
-      <point x="418" y="394" type="line"/>
-      <point x="421" y="360" type="line"/>
-      <point x="669" y="694" type="line"/>
-      <point x="460" y="694" type="line"/>
-      <point x="220" y="363" type="line"/>
+      <point x="469" y="0" type="line"/>
+      <point x="701" y="0" type="line"/>
+      <point x="434" y="394" type="line"/>
+      <point x="437" y="360" type="line"/>
+      <point x="685" y="694" type="line"/>
+      <point x="476" y="694" type="line"/>
+      <point x="236" y="363" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="233" y="0" type="line"/>
-      <point x="233" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="249" y="0" type="line"/>
+      <point x="249" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
index 0dc55cf5..ffed4d0e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kacute" format="2">
-  <advance width="670"/>
+  <advance width="691"/>
   <unicode hex="1E30"/>
   <outline>
     <component base="K"/>
-    <component base="acutecomb.case" xOffset="246"/>
+    <component base="acutecomb.case" xOffset="262"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
index d2f3bf32..6bf9d289 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kcommaaccent" format="2">
-  <advance width="670"/>
+  <advance width="691"/>
   <unicode hex="0136"/>
   <outline>
     <component base="K"/>
-    <component base="commaaccentcomb" xOffset="207"/>
+    <component base="commaaccentcomb" xOffset="223"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_.glif b/src/Cantarell-Bold.ufo/glyphs/L_.glif
index f3269f63..1885d7ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="L" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="004C"/>
   <note>
 L
 </note>
-  <anchor x="256" y="0" name="bottom"/>
-  <anchor x="154" y="377" name="center"/>
-  <anchor x="525" y="352" name="periodcentered"/>
-  <anchor x="140" y="694" name="top"/>
-  <anchor x="355" y="490" name="topright"/>
+  <anchor x="272" y="0" name="bottom"/>
+  <anchor x="170" y="377" name="center"/>
+  <anchor x="541" y="352" name="periodcentered"/>
+  <anchor x="156" y="694" name="top"/>
+  <anchor x="371" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="515" y="0" type="line"/>
-      <point x="515" y="153" type="line"/>
-      <point x="228" y="153" type="line"/>
-      <point x="228" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="531" y="0" type="line"/>
+      <point x="531" y="153" type="line"/>
+      <point x="244" y="153" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
index fde8b323..4b32dd93 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_J_.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="LJ" format="2">
-  <advance width="967"/>
+  <advance width="999"/>
   <unicode hex="01C7"/>
   <outline>
     <component base="L"/>
-    <component base="J" xOffset="520"/>
+    <component base="J" xOffset="552"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
index 8832eda3..e10ed255 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lacute" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="0139"/>
   <outline>
     <component base="L"/>
-    <component base="acutecomb.case" xOffset="61"/>
+    <component base="acutecomb.case" xOffset="77"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
index bec501df..1f73d3ff 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcaron" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="013D"/>
   <outline>
     <component base="L"/>
-    <component base="caroncomb.alt" xOffset="232" yOffset="-2"/>
+    <component base="caroncomb.alt" xOffset="248" yOffset="-2"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
index f7715aa7..ae28ba9b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lcommaaccent" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="013B"/>
   <outline>
     <component base="L"/>
-    <component base="commaaccentcomb" xOffset="138"/>
+    <component base="commaaccentcomb" xOffset="154"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
index d2777db8..a007d427 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dot.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldot" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="013F"/>
   <outline>
     <component base="L"/>
-    <component base="periodcentered.loclCAT.case" xOffset="525"/>
+    <component base="periodcentered.loclCAT.case" xOffset="541"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
index 42b86647..1855dbe6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ldotbelow" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="1E36"/>
   <outline>
     <component base="L"/>
-    <component base="dotbelowcomb" xOffset="106"/>
+    <component base="dotbelowcomb" xOffset="122"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_j.glif b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
index 56d86feb..0d295d07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_j.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_j.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lj" format="2">
-  <advance width="817"/>
+  <advance width="849"/>
   <unicode hex="01C8"/>
   <outline>
     <component base="L"/>
-    <component base="j" xOffset="520"/>
+    <component base="j" xOffset="552"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
index 3d242082..f41caee7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Llinebelow" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="1E3A"/>
   <outline>
     <component base="L"/>
-    <component base="macronbelowcomb" xOffset="11"/>
+    <component base="macronbelowcomb" xOffset="27"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
index 5d8292cb..3da7897c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_slash.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lslash" format="2">
-  <advance width="520"/>
+  <advance width="552"/>
   <unicode hex="0141"/>
   <outline>
     <component base="L"/>
-    <component base="slashshortcomb.case" xOffset="-73" yOffset="107"/>
+    <component base="slashshortcomb.case" xOffset="-57" yOffset="107"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/M_.glif b/src/Cantarell-Bold.ufo/glyphs/M_.glif
index 698e9f12..152ff7cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/M_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/M_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="M" format="2">
-  <advance width="868"/>
+  <advance width="900"/>
   <unicode hex="004D"/>
   <note>
 M
 </note>
-  <anchor x="435" y="0" name="bottom"/>
-  <anchor x="435" y="694" name="top"/>
+  <anchor x="451" y="0" name="bottom"/>
+  <anchor x="451" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="223" y="0" type="line"/>
-      <point x="223" y="458" type="line"/>
-      <point x="202" y="431" type="line"/>
-      <point x="367" y="107" type="line"/>
-      <point x="498" y="107" type="line"/>
-      <point x="656" y="431" type="line"/>
-      <point x="645" y="453" type="line"/>
-      <point x="645" y="0" type="line"/>
-      <point x="813" y="0" type="line"/>
-      <point x="813" y="694" type="line"/>
-      <point x="648" y="694" type="line"/>
-      <point x="407" y="222" type="line"/>
-      <point x="478" y="222" type="line"/>
-      <point x="222" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="239" y="0" type="line"/>
+      <point x="239" y="458" type="line"/>
+      <point x="218" y="431" type="line"/>
+      <point x="383" y="107" type="line"/>
+      <point x="514" y="107" type="line"/>
+      <point x="672" y="431" type="line"/>
+      <point x="661" y="453" type="line"/>
+      <point x="661" y="0" type="line"/>
+      <point x="829" y="0" type="line"/>
+      <point x="829" y="694" type="line"/>
+      <point x="664" y="694" type="line"/>
+      <point x="423" y="222" type="line"/>
+      <point x="494" y="222" type="line"/>
+      <point x="238" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/M_dotbelow.glif
index 93571ec5..6f57534a 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="868"/>
+  <advance width="900"/>
   <unicode hex="1E42"/>
   <outline>
     <component base="M"/>
-    <component base="dotbelowcomb" xOffset="285"/>
+    <component base="dotbelowcomb" xOffset="301"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_.glif b/src/Cantarell-Bold.ufo/glyphs/N_.glif
index ce422760..3255fd6f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="N" format="2">
-  <advance width="756"/>
+  <advance width="788"/>
   <unicode hex="004E"/>
   <note>
 N
 </note>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
+  <anchor x="393" y="0" name="bottom"/>
+  <anchor x="393" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="219" y="0" type="line"/>
-      <point x="219" y="480" type="line"/>
-      <point x="210" y="470" type="line"/>
-      <point x="507" y="0" type="line"/>
-      <point x="701" y="0" type="line"/>
-      <point x="701" y="694" type="line"/>
-      <point x="535" y="694" type="line"/>
-      <point x="533" y="206" type="line"/>
-      <point x="549" y="216" type="line"/>
-      <point x="253" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="480" type="line"/>
+      <point x="226" y="470" type="line"/>
+      <point x="523" y="0" type="line"/>
+      <point x="717" y="0" type="line"/>
+      <point x="717" y="694" type="line"/>
+      <point x="551" y="694" type="line"/>
+      <point x="549" y="206" type="line"/>
+      <point x="565" y="216" type="line"/>
+      <point x="269" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_J_.glif b/src/Cantarell-Bold.ufo/glyphs/N_J_.glif
index 6aa68005..2cb4ff66 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="1203"/>
+  <advance width="1235"/>
   <unicode hex="01CA"/>
   <outline>
     <component base="N"/>
-    <component base="J" xOffset="756"/>
+    <component base="J" xOffset="788"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_acute.glif b/src/Cantarell-Bold.ufo/glyphs/N_acute.glif
index 054c8e16..21b7160f 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="756"/>
+  <advance width="788"/>
   <unicode hex="0143"/>
   <outline>
     <component base="N"/>
-    <component base="acutecomb.case" xOffset="298"/>
+    <component base="acutecomb.case" xOffset="314"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_caron.glif b/src/Cantarell-Bold.ufo/glyphs/N_caron.glif
index a74e335e..00789b2b 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="756"/>
+  <advance width="788"/>
   <unicode hex="0147"/>
   <outline>
     <component base="N"/>
-    <component base="caroncomb.case" xOffset="163"/>
+    <component base="caroncomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/N_commaaccent.glif
index e86b53ae..7604c2ec 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="756"/>
+  <advance width="788"/>
   <unicode hex="0145"/>
   <outline>
     <component base="N"/>
-    <component base="commaaccentcomb" xOffset="259"/>
+    <component base="commaaccentcomb" xOffset="275"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/N_dotaccent.glif
index 819ec30b..4ae6a4ff 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="756"/>
+  <advance width="788"/>
   <unicode hex="1E44"/>
   <outline>
     <component base="N"/>
-    <component base="dotaccentcomb.case" xOffset="232"/>
+    <component base="dotaccentcomb.case" xOffset="248"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/N_dotbelow.glif
index e8309f35..e1b3df14 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="756"/>
+  <advance width="788"/>
   <unicode hex="1E46"/>
   <outline>
     <component base="N"/>
-    <component base="dotbelowcomb" xOffset="227"/>
+    <component base="dotbelowcomb" xOffset="243"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_j.glif b/src/Cantarell-Bold.ufo/glyphs/N_j.glif
index 1344ec83..afad14d3 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="1053"/>
+  <advance width="1085"/>
   <unicode hex="01CB"/>
   <outline>
     <component base="N"/>
-    <component base="j" xOffset="756"/>
+    <component base="j" xOffset="788"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/N_linebelow.glif
index 34ecb263..4b4e645f 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="756"/>
+  <advance width="788"/>
   <unicode hex="1E48"/>
   <outline>
     <component base="N"/>
-    <component base="macronbelowcomb" xOffset="132"/>
+    <component base="macronbelowcomb" xOffset="148"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/N_tilde.glif
index d47cd066..212eebb1 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="756"/>
+  <advance width="788"/>
   <unicode hex="00D1"/>
   <outline>
     <component base="N"/>
-    <component base="tildecomb.case" xOffset="148"/>
+    <component base="tildecomb.case" xOffset="164"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/O_-cy.glif
index 79e4aed6..5355b5b9 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="756"/>
+  <advance width="782"/>
   <unicode hex="041E"/>
   <anchor x="380" y="694" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_.glif b/src/Cantarell-Bold.ufo/glyphs/O_.glif
index 2cffa6f3..7d2ed37a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="O" format="2">
-  <advance width="756"/>
+  <advance width="782"/>
   <unicode hex="004F"/>
   <note>
 O
 </note>
-  <anchor x="562" y="141" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="401" y="347" name="center"/>
-  <anchor x="463" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="81" y="694" name="topleft"/>
-  <anchor x="624" y="694" name="topright"/>
+  <anchor x="575" y="141" name="Qtail"/>
+  <anchor x="391" y="0" name="bottom"/>
+  <anchor x="414" y="347" name="center"/>
+  <anchor x="476" y="10" name="ogonek"/>
+  <anchor x="391" y="694" name="top"/>
+  <anchor x="94" y="694" name="topleft"/>
+  <anchor x="637" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="371" y="-10" type="curve" smooth="yes"/>
-      <point x="588" y="-10"/>
-      <point x="732" y="134"/>
-      <point x="732" y="351" type="curve" smooth="yes"/>
-      <point x="732" y="563"/>
-      <point x="592" y="704"/>
-      <point x="382" y="704" type="curve" smooth="yes"/>
-      <point x="167" y="704"/>
-      <point x="24" y="559"/>
-      <point x="24" y="341" type="curve" smooth="yes"/>
-      <point x="24" y="130"/>
-      <point x="163" y="-10"/>
+      <point x="384" y="-10" type="curve" smooth="yes"/>
+      <point x="601" y="-10"/>
+      <point x="745" y="134"/>
+      <point x="745" y="351" type="curve" smooth="yes"/>
+      <point x="745" y="563"/>
+      <point x="605" y="704"/>
+      <point x="395" y="704" type="curve" smooth="yes"/>
+      <point x="180" y="704"/>
+      <point x="37" y="559"/>
+      <point x="37" y="341" type="curve" smooth="yes"/>
+      <point x="37" y="130"/>
+      <point x="176" y="-10"/>
     </contour>
     <contour>
-      <point x="382" y="140" type="curve" smooth="yes"/>
-      <point x="275" y="140"/>
-      <point x="204" y="224"/>
-      <point x="204" y="351" type="curve" smooth="yes"/>
-      <point x="204" y="473"/>
-      <point x="271" y="554"/>
-      <point x="371" y="554" type="curve" smooth="yes"/>
-      <point x="480" y="554"/>
-      <point x="552" y="469"/>
-      <point x="552" y="341" type="curve" smooth="yes"/>
-      <point x="552" y="220"/>
-      <point x="484" y="140"/>
+      <point x="395" y="140" type="curve" smooth="yes"/>
+      <point x="288" y="140"/>
+      <point x="217" y="224"/>
+      <point x="217" y="351" type="curve" smooth="yes"/>
+      <point x="217" y="473"/>
+      <point x="284" y="554"/>
+      <point x="384" y="554" type="curve" smooth="yes"/>
+      <point x="493" y="554"/>
+      <point x="565" y="469"/>
+      <point x="565" y="341" type="curve" smooth="yes"/>
+      <point x="565" y="220"/>
+      <point x="497" y="140"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
index c6011de6..ca3cc3c1 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="1032"/>
+  <advance width="1059"/>
   <unicode hex="0152"/>
-  <anchor x="603" y="0" name="bottom"/>
-  <anchor x="603" y="694" name="top"/>
+  <anchor x="616" y="0" name="bottom"/>
+  <anchor x="616" y="694" name="top"/>
   <outline>
     <contour>
-      <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"/>
+      <point x="415" y="-10" type="curve" smooth="yes"/>
+      <point x="493" y="-10"/>
+      <point x="566" y="7"/>
+      <point x="621" y="38" type="curve"/>
+      <point x="530" y="167" type="line"/>
+      <point x="502" y="150"/>
+      <point x="466" y="140"/>
+      <point x="424" y="140" type="curve" smooth="yes"/>
+      <point x="300" y="140"/>
+      <point x="217" y="224"/>
+      <point x="217" y="351" type="curve" smooth="yes"/>
+      <point x="217" y="473"/>
+      <point x="294" y="554"/>
+      <point x="414" y="554" type="curve" smooth="yes"/>
+      <point x="454" y="554"/>
+      <point x="491" y="545"/>
+      <point x="521" y="528" type="curve"/>
+      <point x="621" y="660" type="line"/>
+      <point x="568" y="688"/>
+      <point x="499" y="704"/>
+      <point x="424" y="704" type="curve" smooth="yes"/>
+      <point x="191" y="704"/>
+      <point x="37" y="559"/>
+      <point x="37" y="341" type="curve" smooth="yes"/>
+      <point x="37" y="130"/>
+      <point x="187" y="-10"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="511" y="0" type="line"/>
+      <point x="684" y="0" type="line"/>
+      <point x="684" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="591" y="0" type="line"/>
+      <point x="1009" y="0" type="line"/>
+      <point x="1009" y="152" type="line"/>
+      <point x="591" y="152" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="591" y="278" type="line"/>
+      <point x="981" y="278" type="line"/>
+      <point x="981" y="430" type="line"/>
+      <point x="591" y="430" type="line"/>
     </contour>
     <contour>
-      <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"/>
+      <point x="591" y="542" type="line"/>
+      <point x="1009" y="542" type="line"/>
+      <point x="1009" y="694" type="line"/>
+      <point x="591" 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 83a66adf..168c27b4 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D3"/>
   <outline>
     <component base="O"/>
-    <component base="acutecomb.case" xOffset="299"/>
+    <component base="acutecomb.case" xOffset="312"/>
   </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 bbd6ff9c..4599b184 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="756"/>
+  <advance width="782"/>
   <unicode hex="04E8"/>
   <outline>
     <component base="O"/>
-    <component base="_bar-cy" xOffset="-39" yOffset="4"/>
+    <component base="_bar-cy" xOffset="-26" 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 155a65ef..a83c1a98 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="756"/>
+  <advance width="782"/>
   <unicode hex="014E"/>
   <outline>
     <component base="O"/>
-    <component base="brevecomb.case" xOffset="145"/>
+    <component base="brevecomb.case" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_caron.glif b/src/Cantarell-Bold.ufo/glyphs/O_caron.glif
index 14fde116..233e3696 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="756"/>
+  <advance width="782"/>
   <unicode hex="01D1"/>
   <outline>
     <component base="O"/>
-    <component base="caroncomb.case" xOffset="164"/>
+    <component base="caroncomb.case" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/O_circumflex.glif
index a7f19d82..1fd6f5de 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.case" xOffset="179"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
index de56450e..b4f78940 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexacute.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexacute" format="2">
-  <advance width="756"/>
+  <advance width="782"/>
   <unicode hex="1ED0"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="174" yOffset="204"/>
-    <component base="acutecomb.loclVIET" xOffset="469" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="acutecomb.loclVIET" xOffset="482" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexdotbelow.glif
index 719fa354..4361c33a 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="756"/>
+  <advance width="782"/>
   <unicode hex="1ED8"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="228"/>
-    <component base="circumflexcomb.case" xOffset="179"/>
+    <component base="dotbelowcomb" xOffset="241"/>
+    <component base="circumflexcomb.case" xOffset="192"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
index 1718ccf4..10404ae0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexgrave.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexgrave" format="2">
-  <advance width="756"/>
+  <advance width="782"/>
   <unicode hex="1ED2"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="174" yOffset="204"/>
-    <component base="gravecomb.loclVIET" xOffset="379" yOffset="327"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="gravecomb.loclVIET" xOffset="392" yOffset="327"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
index 435ff764..7d09ee7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflexhookabove.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflexhookabove" format="2">
-  <advance width="756"/>
+  <advance width="782"/>
   <unicode hex="1ED4"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="174" yOffset="204"/>
-    <component base="hookabovecomb.loclVIET" xOffset="402" yOffset="326"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="hookabovecomb.loclVIET" xOffset="415" yOffset="326"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
index 3ae882ed..6829854f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_circumflextilde.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ocircumflextilde" format="2">
-  <advance width="756"/>
+  <advance width="782"/>
   <unicode hex="1ED6"/>
   <outline>
     <component base="O"/>
-    <component base="circumflexcomb.loclVIET" xOffset="174" yOffset="204"/>
-    <component base="tildecomb.loclVIET" xOffset="160" yOffset="344"/>
+    <component base="circumflexcomb.loclVIET" xOffset="187" yOffset="204"/>
+    <component base="tildecomb.loclVIET" xOffset="173" yOffset="344"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/O_dblgrave.glif
index ebe3f67c..732f1519 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="756"/>
+  <advance width="782"/>
   <unicode hex="020C"/>
   <outline>
     <component base="O"/>
-    <component base="dblgravecomb.case" xOffset="95"/>
+    <component base="dblgravecomb.case" xOffset="108"/>
   </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 1fa81a6e..093eae0c 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="756"/>
+  <advance width="782"/>
   <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 c3f89b0b..81effe21 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D6"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
+    <component base="dieresiscomb.case" xOffset="116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_dieresismacron.glif
index 759ef05d..1d1ef9d8 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="756"/>
+  <advance width="782"/>
   <unicode hex="022A"/>
   <outline>
     <component base="O"/>
-    <component base="dieresiscomb.case" xOffset="103"/>
-    <component base="macroncomb.case" xOffset="139" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="116"/>
+    <component base="macroncomb.case" xOffset="152" 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 b1892da3..e799f4f3 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="756"/>
+  <advance width="782"/>
   <unicode hex="0230"/>
   <outline>
     <component base="O"/>
-    <component base="dotaccentcomb.case" xOffset="233"/>
-    <component base="macroncomb.case" xOffset="139" yOffset="252"/>
+    <component base="dotaccentcomb.case" xOffset="246"/>
+    <component base="macroncomb.case" xOffset="152" 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 2533da42..8a251e7b 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="756"/>
+  <advance width="782"/>
   <unicode hex="1ECC"/>
   <outline>
     <component base="O"/>
-    <component base="dotbelowcomb" xOffset="228"/>
+    <component base="dotbelowcomb" xOffset="241"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_grave.glif b/src/Cantarell-Bold.ufo/glyphs/O_grave.glif
index 953ac16a..dbd1fed1 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D2"/>
   <outline>
     <component base="O"/>
-    <component base="gravecomb.case" xOffset="149"/>
+    <component base="gravecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/O_hookabove.glif
index 871864ad..d6fe3c75 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="756"/>
+  <advance width="782"/>
   <unicode hex="1ECE"/>
   <outline>
     <component base="O"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horn.glif b/src/Cantarell-Bold.ufo/glyphs/O_horn.glif
index aa8d9ccc..0a04f0a9 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="838"/>
+  <advance width="864"/>
   <unicode hex="01A0"/>
   <outline>
     <component base="O"/>
-    <component base="horncomb" xOffset="553" yOffset="212"/>
+    <component base="horncomb" xOffset="566" 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 9e6109e5..aa9dd8b9 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="838"/>
+  <advance width="864"/>
   <unicode hex="1EDA"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="acutecomb.case" xOffset="299"/>
+    <component base="acutecomb.case" xOffset="312"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_horndotbelow.glif
index cc0261fb..4859744c 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="838"/>
+  <advance width="864"/>
   <unicode hex="1EE2"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="dotbelowcomb" xOffset="228"/>
+    <component base="dotbelowcomb" xOffset="241"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif b/src/Cantarell-Bold.ufo/glyphs/O_horngrave.glif
index 943420f3..8f22e765 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="838"/>
+  <advance width="864"/>
   <unicode hex="1EDC"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="gravecomb.case" xOffset="149"/>
+    <component base="gravecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_hornhookabove.glif
index 610b130d..3b7fdd94 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="838"/>
+  <advance width="864"/>
   <unicode hex="1EDE"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="hookabovecomb.case" xOffset="223"/>
+    <component base="hookabovecomb.case" xOffset="236"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif b/src/Cantarell-Bold.ufo/glyphs/O_horntilde.glif
index c1d5e4c1..490be6ad 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="838"/>
+  <advance width="864"/>
   <unicode hex="1EE0"/>
   <outline>
     <component base="Ohorn"/>
-    <component base="tildecomb.case" xOffset="149"/>
+    <component base="tildecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_hungarumlaut.glif
index c63a6241..29d314b7 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="756"/>
+  <advance width="782"/>
   <unicode hex="0150"/>
   <outline>
     <component base="O"/>
-    <component base="hungarumlautcomb.case" xOffset="140"/>
+    <component base="hungarumlautcomb.case" xOffset="153"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_invertedbreve.glif
index f4d31f06..cfd55746 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="756"/>
+  <advance width="782"/>
   <unicode hex="020E"/>
   <outline>
     <component base="O"/>
-    <component base="breveinvertedcomb.case" xOffset="147"/>
+    <component base="breveinvertedcomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_macron.glif b/src/Cantarell-Bold.ufo/glyphs/O_macron.glif
index b0e04f39..9a180ccf 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="756"/>
+  <advance width="782"/>
   <unicode hex="014C"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="139"/>
+    <component base="macroncomb.case" xOffset="152"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_macronacute.glif
index 2efdc58b..97d5c66f 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="756"/>
+  <advance width="782"/>
   <unicode hex="1E52"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="139"/>
-    <component base="acutecomb.case" xOffset="299" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="152"/>
+    <component base="acutecomb.case" xOffset="312" 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 33a52ba4..663da4bd 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="756"/>
+  <advance width="782"/>
   <unicode hex="1E50"/>
   <outline>
     <component base="O"/>
-    <component base="macroncomb.case" xOffset="139"/>
-    <component base="gravecomb.case" xOffset="149" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="152"/>
+    <component base="gravecomb.case" xOffset="162" 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 30fd344f..e3cb9a71 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="756"/>
+  <advance width="782"/>
   <unicode hex="01EA"/>
   <outline>
     <component base="O"/>
-    <component base="ogonekcomb.tall.case" xOffset="3"/>
+    <component base="ogonekcomb.tall.case" xOffset="16"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_slash.glif b/src/Cantarell-Bold.ufo/glyphs/O_slash.glif
index 9d49f485..278ae717 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D8"/>
   <outline>
     <component base="O"/>
-    <component base="slashlongcomb.case" xOffset="90" yOffset="8"/>
+    <component base="slashlongcomb.case" xOffset="103" 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 ec61da7d..d0b927bb 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="756"/>
+  <advance width="782"/>
   <unicode hex="01FE"/>
   <outline>
     <component base="Oslash"/>
-    <component base="acutecomb.case" xOffset="299"/>
+    <component base="acutecomb.case" xOffset="312"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/O_tilde.glif
index 87e5d0ac..2ec89ee5 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="756"/>
+  <advance width="782"/>
   <unicode hex="00D5"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="149"/>
+    <component base="tildecomb.case" xOffset="162"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/O_tildeacute.glif
index 6cdaf4fc..a457c4ca 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="756"/>
+  <advance width="782"/>
   <unicode hex="1E4C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="149"/>
-    <component base="acutecomb.case" xOffset="299" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="162"/>
+    <component base="acutecomb.case" xOffset="312" 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 34adaf9f..e030f7c8 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="756"/>
+  <advance width="782"/>
   <unicode hex="1E4E"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="149"/>
-    <component base="dieresiscomb.case" xOffset="103" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="162"/>
+    <component base="dieresiscomb.case" xOffset="116" 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 13729324..5f121cd6 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="756"/>
+  <advance width="782"/>
   <unicode hex="022C"/>
   <outline>
     <component base="O"/>
-    <component base="tildecomb.case" xOffset="149"/>
-    <component base="macroncomb.case" xOffset="139" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="162"/>
+    <component base="macroncomb.case" xOffset="152" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_.glif b/src/Cantarell-Bold.ufo/glyphs/P_.glif
index d85e64de..abd46666 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_.glif
@@ -1,38 +1,38 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="P" format="2">
-  <advance width="609"/>
+  <advance width="625"/>
   <unicode hex="0050"/>
   <note>
 P
 </note>
-  <anchor x="313" y="0" name="bottom"/>
-  <anchor x="313" y="694" name="top"/>
+  <anchor x="329" y="0" name="bottom"/>
+  <anchor x="329" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="164" y="204" type="line"/>
-      <point x="285" y="204" type="line" smooth="yes"/>
-      <point x="473" y="204"/>
-      <point x="597" y="307"/>
-      <point x="597" y="463" type="curve" smooth="yes"/>
-      <point x="597" y="608"/>
-      <point x="491" y="694"/>
-      <point x="314" y="694" type="curve" smooth="yes"/>
-      <point x="164" y="694" type="line"/>
-      <point x="164" y="542" type="line"/>
-      <point x="300" y="542" type="line" smooth="yes"/>
-      <point x="370" y="542"/>
-      <point x="417" y="504"/>
-      <point x="417" y="446" type="curve" smooth="yes"/>
-      <point x="417" y="390"/>
-      <point x="378" y="356"/>
-      <point x="316" y="356" type="curve" smooth="yes"/>
-      <point x="164" y="356" type="line"/>
+      <point x="180" y="204" type="line"/>
+      <point x="301" y="204" type="line" smooth="yes"/>
+      <point x="489" y="204"/>
+      <point x="613" y="307"/>
+      <point x="613" y="463" type="curve" smooth="yes"/>
+      <point x="613" y="608"/>
+      <point x="507" y="694"/>
+      <point x="330" y="694" type="curve" smooth="yes"/>
+      <point x="180" y="694" type="line"/>
+      <point x="180" y="542" type="line"/>
+      <point x="316" y="542" type="line" smooth="yes"/>
+      <point x="386" y="542"/>
+      <point x="433" y="504"/>
+      <point x="433" y="446" type="curve" smooth="yes"/>
+      <point x="433" y="390"/>
+      <point x="394" y="356"/>
+      <point x="332" y="356" type="curve" smooth="yes"/>
+      <point x="180" y="356" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/P_alochka-cy.glif
index 8ae1f4a4..c82c63f9 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="286"/>
+  <advance width="318"/>
   <unicode hex="04C0"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_.glif b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
index 50fc39c1..0dc17202 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Q" format="2">
-  <advance width="756"/>
+  <advance width="792"/>
   <unicode hex="0051"/>
   <note>
 Q
 </note>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="378" y="694" name="top"/>
+  <anchor x="391" y="0" name="bottom"/>
+  <anchor x="391" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="371" y="-10" type="curve" smooth="yes"/>
-      <point x="588" y="-10"/>
-      <point x="732" y="134"/>
-      <point x="732" y="351" type="curve" smooth="yes"/>
-      <point x="732" y="563"/>
-      <point x="592" y="704"/>
-      <point x="382" y="704" type="curve" smooth="yes"/>
-      <point x="167" y="704"/>
-      <point x="24" y="559"/>
-      <point x="24" y="341" type="curve" smooth="yes"/>
-      <point x="24" y="130"/>
-      <point x="163" y="-10"/>
+      <point x="384" y="-10" type="curve" smooth="yes"/>
+      <point x="601" y="-10"/>
+      <point x="745" y="134"/>
+      <point x="745" y="351" type="curve" smooth="yes"/>
+      <point x="745" y="563"/>
+      <point x="605" y="704"/>
+      <point x="395" y="704" type="curve" smooth="yes"/>
+      <point x="180" y="704"/>
+      <point x="37" y="559"/>
+      <point x="37" y="341" type="curve" smooth="yes"/>
+      <point x="37" y="130"/>
+      <point x="176" y="-10"/>
     </contour>
     <contour>
-      <point x="382" y="140" type="curve" smooth="yes"/>
-      <point x="269" y="140"/>
-      <point x="202" y="218"/>
-      <point x="202" y="351" type="curve" smooth="yes"/>
-      <point x="202" y="479"/>
-      <point x="265" y="554"/>
-      <point x="371" y="554" type="curve" smooth="yes"/>
-      <point x="486" y="554"/>
-      <point x="554" y="475"/>
-      <point x="554" y="341" type="curve" smooth="yes"/>
-      <point x="554" y="215"/>
-      <point x="490" y="140"/>
+      <point x="395" y="140" type="curve" smooth="yes"/>
+      <point x="282" y="140"/>
+      <point x="215" y="218"/>
+      <point x="215" y="351" type="curve" smooth="yes"/>
+      <point x="215" y="479"/>
+      <point x="278" y="554"/>
+      <point x="384" y="554" type="curve" smooth="yes"/>
+      <point x="499" y="554"/>
+      <point x="567" y="475"/>
+      <point x="567" y="341" type="curve" smooth="yes"/>
+      <point x="567" y="215"/>
+      <point x="503" y="140"/>
     </contour>
     <contour>
-      <point x="642" y="-63" type="line"/>
-      <point x="750" y="38" type="line"/>
-      <point x="425" y="348" type="line"/>
-      <point x="321" y="245" type="line"/>
+      <point x="655" y="-63" type="line"/>
+      <point x="763" y="38" type="line"/>
+      <point x="438" y="348" type="line"/>
+      <point x="334" y="245" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
index 8efb44f9..243ffc0f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_a-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Qa-cy" format="2">
-  <advance width="756"/>
+  <advance width="792"/>
   <unicode hex="051A"/>
   <outline>
     <component base="Q"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_.glif b/src/Cantarell-Bold.ufo/glyphs/R_.glif
index b9a48655..08b7b323 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="R" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0052"/>
   <note>
 R
 </note>
-  <anchor x="312" y="0" name="bottom"/>
-  <anchor x="312" y="694" name="top"/>
+  <anchor x="328" y="0" name="bottom"/>
+  <anchor x="328" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="176" y="237" type="line"/>
-      <point x="317" y="237" type="line" smooth="yes"/>
-      <point x="487" y="237"/>
-      <point x="600" y="338"/>
-      <point x="600" y="484" type="curve" smooth="yes"/>
-      <point x="600" y="618"/>
-      <point x="504" y="694"/>
-      <point x="341" y="694" type="curve" smooth="yes"/>
-      <point x="176" y="694" type="line"/>
-      <point x="176" y="543" type="line"/>
-      <point x="317" y="543" type="line" smooth="yes"/>
-      <point x="382" y="543"/>
-      <point x="420" y="512"/>
-      <point x="420" y="460" type="curve" smooth="yes"/>
-      <point x="420" y="413"/>
-      <point x="392" y="384"/>
-      <point x="341" y="384" type="curve" smooth="yes"/>
-      <point x="176" y="384" type="line"/>
+      <point x="192" y="237" type="line"/>
+      <point x="333" y="237" type="line" smooth="yes"/>
+      <point x="503" y="237"/>
+      <point x="616" y="338"/>
+      <point x="616" y="484" type="curve" smooth="yes"/>
+      <point x="616" y="618"/>
+      <point x="520" y="694"/>
+      <point x="357" y="694" type="curve" smooth="yes"/>
+      <point x="192" y="694" type="line"/>
+      <point x="192" y="543" type="line"/>
+      <point x="333" y="543" type="line" smooth="yes"/>
+      <point x="398" y="543"/>
+      <point x="436" y="512"/>
+      <point x="436" y="460" type="curve" smooth="yes"/>
+      <point x="436" y="413"/>
+      <point x="408" y="384"/>
+      <point x="357" y="384" type="curve" smooth="yes"/>
+      <point x="192" y="384" type="line"/>
     </contour>
     <contour>
-      <point x="440" y="0" type="line"/>
-      <point x="648" y="0" type="line"/>
-      <point x="460" y="297" type="line"/>
-      <point x="271" y="297" type="line"/>
+      <point x="456" y="0" type="line"/>
+      <point x="664" y="0" type="line"/>
+      <point x="476" y="297" type="line"/>
+      <point x="287" y="297" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
index 284b44d5..b0ef7b22 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Racute" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0154"/>
   <outline>
     <component base="R"/>
-    <component base="acutecomb.case" xOffset="233"/>
+    <component base="acutecomb.case" xOffset="249"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
index 544a7014..3f31fec4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcaron" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0158"/>
   <outline>
     <component base="R"/>
-    <component base="caroncomb.case" xOffset="98"/>
+    <component base="caroncomb.case" xOffset="114"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
index 2399c8a8..bd5baf4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rcommaaccent" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0156"/>
   <outline>
     <component base="R"/>
-    <component base="commaaccentcomb" xOffset="194"/>
+    <component base="commaaccentcomb" xOffset="210"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
index a99e254a..0b5a42ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdblgrave" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0210"/>
   <outline>
     <component base="R"/>
-    <component base="dblgravecomb.case" xOffset="29"/>
+    <component base="dblgravecomb.case" xOffset="45"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
index 1dceffe7..5e06bb58 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rdotbelow" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="1E5A"/>
   <outline>
     <component base="R"/>
-    <component base="dotbelowcomb" xOffset="162"/>
+    <component base="dotbelowcomb" xOffset="178"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
index 423348d8..2a04b914 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rinvertedbreve" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="0212"/>
   <outline>
     <component base="R"/>
-    <component base="breveinvertedcomb.case" xOffset="81"/>
+    <component base="breveinvertedcomb.case" xOffset="97"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
index f3d6fa78..a1e55575 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rlinebelow" format="2">
-  <advance width="646"/>
+  <advance width="671"/>
   <unicode hex="1E5E"/>
   <outline>
     <component base="R"/>
-    <component base="macronbelowcomb" xOffset="67"/>
+    <component base="macronbelowcomb" xOffset="83"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_.glif b/src/Cantarell-Bold.ufo/glyphs/S_.glif
index 74f23fb7..0841ee2c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="S" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="0053"/>
   <note>
 S
 </note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="271" y="694" name="top"/>
+  <anchor x="295" y="0" name="bottom"/>
+  <anchor x="288" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="261" y="-10" type="curve" smooth="yes"/>
-      <point x="445" y="-10"/>
-      <point x="547" y="78"/>
-      <point x="547" y="217" type="curve" smooth="yes"/>
-      <point x="547" y="472"/>
-      <point x="204" y="395"/>
-      <point x="204" y="498" type="curve" smooth="yes"/>
-      <point x="204" y="533"/>
-      <point x="243" y="552"/>
-      <point x="311" y="552" type="curve" smooth="yes"/>
-      <point x="367" y="552"/>
-      <point x="429" y="542"/>
-      <point x="478" y="525" type="curve"/>
-      <point x="526" y="663" type="line"/>
-      <point x="468" y="689"/>
-      <point x="391" y="704"/>
-      <point x="320" y="704" type="curve" smooth="yes"/>
-      <point x="144" y="704"/>
-      <point x="24" y="612"/>
-      <point x="24" y="472" type="curve" smooth="yes"/>
-      <point x="24" y="236"/>
-      <point x="365" y="303"/>
-      <point x="365" y="196" type="curve" smooth="yes"/>
-      <point x="365" y="164"/>
-      <point x="335" y="146"/>
-      <point x="268" y="146" type="curve" smooth="yes"/>
-      <point x="205" y="146"/>
-      <point x="129" y="158"/>
-      <point x="60" y="187" type="curve"/>
-      <point x="12" y="45" type="line"/>
-      <point x="83" y="13"/>
-      <point x="175" y="-10"/>
+      <point x="278" y="-10" type="curve" smooth="yes"/>
+      <point x="462" y="-10"/>
+      <point x="564" y="78"/>
+      <point x="564" y="217" type="curve" smooth="yes"/>
+      <point x="564" y="472"/>
+      <point x="221" y="395"/>
+      <point x="221" y="498" type="curve" smooth="yes"/>
+      <point x="221" y="533"/>
+      <point x="260" y="552"/>
+      <point x="328" y="552" type="curve" smooth="yes"/>
+      <point x="384" y="552"/>
+      <point x="446" y="542"/>
+      <point x="495" y="525" type="curve"/>
+      <point x="543" y="663" type="line"/>
+      <point x="485" y="689"/>
+      <point x="408" y="704"/>
+      <point x="337" y="704" type="curve" smooth="yes"/>
+      <point x="161" y="704"/>
+      <point x="41" y="612"/>
+      <point x="41" y="472" type="curve" smooth="yes"/>
+      <point x="41" y="236"/>
+      <point x="382" y="303"/>
+      <point x="382" y="196" type="curve" smooth="yes"/>
+      <point x="382" y="164"/>
+      <point x="352" y="146"/>
+      <point x="285" y="146" type="curve" smooth="yes"/>
+      <point x="222" y="146"/>
+      <point x="146" y="158"/>
+      <point x="77" y="187" type="curve"/>
+      <point x="29" y="45" type="line"/>
+      <point x="100" y="13"/>
+      <point x="192" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_acute.glif b/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
index 04224e68..a17c67cc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacute" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="015A"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="192"/>
+    <component base="acutecomb.case" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
index 4f6ff189..c6fda2b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_acutedotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sacutedotaccent" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="1E64"/>
   <outline>
     <component base="S"/>
-    <component base="acutecomb.case" xOffset="192"/>
-    <component base="dotaccentcomb.case" xOffset="29" yOffset="145"/>
+    <component base="acutecomb.case" xOffset="209"/>
+    <component base="dotaccentcomb.case" xOffset="46" yOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif b/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
index 979647cb..c2b4720d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_altillo.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Saltillo" format="2">
-  <advance width="300"/>
+  <advance width="332"/>
   <unicode hex="A78B"/>
   <outline>
-    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="10" yOffset="-808"/>
+    <component base="quotesingle" xScale="1.04" yScale="2.16474" xOffset="26" yOffset="-808"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_caron.glif b/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
index ba012c7d..50eecccc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scaron" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="0160"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="57"/>
+    <component base="caroncomb.case" xOffset="74"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
index 26039563..91c6cbfe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_carondotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scarondotaccent" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="1E66"/>
   <outline>
     <component base="S"/>
-    <component base="caroncomb.case" xOffset="57"/>
-    <component base="dotaccentcomb.case" xOffset="161" yOffset="194"/>
+    <component base="caroncomb.case" xOffset="74"/>
+    <component base="dotaccentcomb.case" xOffset="178" yOffset="194"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
index 616cda09..716a55d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scedilla" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="015E"/>
   <outline>
     <component base="S"/>
-    <component base="cedillacomb" xOffset="120"/>
+    <component base="cedillacomb" xOffset="137"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
index 80f7cc7f..9f632d50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scircumflex" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="015C"/>
   <outline>
     <component base="S"/>
-    <component base="circumflexcomb.case" xOffset="72"/>
+    <component base="circumflexcomb.case" xOffset="89"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
index e4bc65c8..432e3aac 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Scommaaccent" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="0218"/>
   <outline>
     <component base="S"/>
-    <component base="commaaccentcomb" xOffset="160"/>
+    <component base="commaaccentcomb" xOffset="177"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
index 045ebf3c..e14f0c61 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotaccent" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="1E60"/>
   <outline>
     <component base="S"/>
-    <component base="dotaccentcomb.case" xOffset="126"/>
+    <component base="dotaccentcomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
index 28c6cef5..8ce7aec8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelow" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="1E62"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="128"/>
+    <component base="dotbelowcomb" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
index fb4c2a4b..08e15875 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_dotbelowdotaccent.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sdotbelowdotaccent" format="2">
-  <advance width="559"/>
+  <advance width="593"/>
   <unicode hex="1E68"/>
   <outline>
     <component base="S"/>
-    <component base="dotbelowcomb" xOffset="128"/>
-    <component base="dotaccentcomb.case" xOffset="126"/>
+    <component base="dotbelowcomb" xOffset="145"/>
+    <component base="dotaccentcomb.case" xOffset="143"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_.glif b/src/Cantarell-Bold.ufo/glyphs/T_.glif
index f9f8b946..2a366078 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="T" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="0054"/>
   <note>
 T
 </note>
-  <anchor x="306" y="0" name="bottom"/>
-  <anchor x="305" y="327" name="center"/>
-  <anchor x="304" y="694" name="top"/>
+  <anchor x="308" y="0" name="bottom"/>
+  <anchor x="307" y="327" name="center"/>
+  <anchor x="306" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="219" y="0" type="line"/>
-      <point x="389" y="0" type="line"/>
-      <point x="389" y="660" type="line"/>
-      <point x="219" y="660" type="line"/>
+      <point x="221" y="0" type="line"/>
+      <point x="391" y="0" type="line"/>
+      <point x="391" y="660" type="line"/>
+      <point x="221" y="660" type="line"/>
     </contour>
     <contour>
-      <point x="5" y="542" type="line"/>
-      <point x="605" y="542" type="line"/>
-      <point x="605" y="694" type="line"/>
-      <point x="5" y="694" type="line"/>
+      <point x="7" y="542" type="line"/>
+      <point x="607" y="542" type="line"/>
+      <point x="607" y="694" type="line"/>
+      <point x="7" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_bar.glif b/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
index 4b6ac42e..6a1b993b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_bar.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tbar" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="0166"/>
   <outline>
     <component base="T"/>
-    <component base="strokeshortcomb.case" xOffset="90" yOffset="29"/>
+    <component base="strokeshortcomb.case" xOffset="92" yOffset="29"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_caron.glif b/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
index b9d38b2d..0d37bbd3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcaron" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="0164"/>
   <outline>
     <component base="T"/>
-    <component base="caroncomb.case" xOffset="90"/>
+    <component base="caroncomb.case" xOffset="92"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif b/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
index 81f97366..591365d0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_cedilla.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcedilla" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="0162"/>
   <outline>
     <component base="T"/>
-    <component base="cedillacomb" xOffset="148"/>
+    <component base="cedillacomb" xOffset="150"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif 
b/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
index 3cf5de5b..3b613f70 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_commaaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tcommaaccent" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="021A"/>
   <outline>
     <component base="T"/>
-    <component base="commaaccentcomb" xOffset="188"/>
+    <component base="commaaccentcomb" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
index 31421953..79eae382 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tdotbelow" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="1E6C"/>
   <outline>
     <component base="T"/>
-    <component base="dotbelowcomb" xOffset="156"/>
+    <component base="dotbelowcomb" xOffset="158"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
index feff2111..62ce0f7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Te-cy" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="0422"/>
   <anchor x="600" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
index ac6c8706..2e36809b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Thorn" format="2">
-  <advance width="609"/>
+  <advance width="625"/>
   <unicode hex="00DE"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="228" y="0" type="line"/>
-      <point x="228" y="694" type="line"/>
-      <point x="55" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
-      <point x="164" y="116" type="line"/>
-      <point x="300" y="116" type="line" smooth="yes"/>
-      <point x="478" y="116"/>
-      <point x="597" y="216"/>
-      <point x="597" y="365" type="curve" smooth="yes"/>
-      <point x="597" y="510"/>
-      <point x="483" y="606"/>
-      <point x="314" y="606" type="curve" smooth="yes"/>
-      <point x="164" y="606" type="line"/>
-      <point x="164" y="454" type="line"/>
-      <point x="305" y="454" type="line" smooth="yes"/>
-      <point x="373" y="454"/>
-      <point x="417" y="415"/>
-      <point x="417" y="355" type="curve" smooth="yes"/>
-      <point x="417" y="299"/>
-      <point x="381" y="268"/>
-      <point x="316" y="268" type="curve" smooth="yes"/>
-      <point x="164" y="268" type="line"/>
+      <point x="180" y="116" type="line"/>
+      <point x="316" y="116" type="line" smooth="yes"/>
+      <point x="494" y="116"/>
+      <point x="613" y="216"/>
+      <point x="613" y="365" type="curve" smooth="yes"/>
+      <point x="613" y="510"/>
+      <point x="499" y="606"/>
+      <point x="330" y="606" type="curve" smooth="yes"/>
+      <point x="180" y="606" type="line"/>
+      <point x="180" y="454" type="line"/>
+      <point x="321" y="454" type="line" smooth="yes"/>
+      <point x="389" y="454"/>
+      <point x="433" y="415"/>
+      <point x="433" y="355" type="curve" smooth="yes"/>
+      <point x="433" y="299"/>
+      <point x="397" y="268"/>
+      <point x="332" y="268" type="curve" smooth="yes"/>
+      <point x="180" y="268" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif b/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
index b4dbe787..a752308e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_linebelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tlinebelow" format="2">
-  <advance width="610"/>
+  <advance width="614"/>
   <unicode hex="1E6E"/>
   <outline>
     <component base="T"/>
-    <component base="macronbelowcomb" xOffset="61"/>
+    <component base="macronbelowcomb" xOffset="63"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_.glif b/src/Cantarell-Bold.ufo/glyphs/U_.glif
index 2d6ec36c..0dce6484 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="U" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0055"/>
   <note>
 U
 </note>
-  <anchor x="349" y="0" name="bottom"/>
-  <anchor x="445" y="10" name="ogonek"/>
-  <anchor x="349" y="694" name="top"/>
-  <anchor x="652" y="694" name="topright"/>
+  <anchor x="359" y="0" name="bottom"/>
+  <anchor x="455" y="10" name="ogonek"/>
+  <anchor x="359" y="694" name="top"/>
+  <anchor x="662" y="694" name="topright"/>
   <outline>
     <contour>
-      <point x="341" y="-10" type="curve" smooth="yes"/>
-      <point x="530" y="-10"/>
-      <point x="652" y="107"/>
-      <point x="652" y="287" type="curve" smooth="yes"/>
-      <point x="652" y="694" type="line"/>
-      <point x="481" y="694" type="line"/>
-      <point x="481" y="267" type="line" smooth="yes"/>
-      <point x="481" y="187"/>
-      <point x="436" y="140"/>
-      <point x="360" y="140" type="curve" smooth="yes"/>
-      <point x="271" y="140"/>
-      <point x="219" y="195"/>
-      <point x="219" y="287" type="curve" smooth="yes"/>
-      <point x="219" y="694" type="line"/>
-      <point x="46" y="694" type="line"/>
-      <point x="46" y="277" type="line" smooth="yes"/>
-      <point x="46" y="98"/>
-      <point x="157" y="-10"/>
+      <point x="351" y="-10" type="curve" smooth="yes"/>
+      <point x="540" y="-10"/>
+      <point x="662" y="107"/>
+      <point x="662" y="287" type="curve" smooth="yes"/>
+      <point x="662" y="694" type="line"/>
+      <point x="491" y="694" type="line"/>
+      <point x="491" y="267" type="line" smooth="yes"/>
+      <point x="491" y="187"/>
+      <point x="446" y="140"/>
+      <point x="370" y="140" type="curve" smooth="yes"/>
+      <point x="281" y="140"/>
+      <point x="229" y="195"/>
+      <point x="229" y="287" type="curve" smooth="yes"/>
+      <point x="229" y="694" type="line"/>
+      <point x="56" y="694" type="line"/>
+      <point x="56" y="277" type="line" smooth="yes"/>
+      <point x="56" y="98"/>
+      <point x="167" y="-10"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_acute.glif b/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
index 7d71b05e..b1c9e7b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uacute" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="00DA"/>
   <outline>
     <component base="U"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <component base="acutecomb.case" xOffset="280"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_breve.glif b/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
index 9f039770..5454ea9a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_breve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ubreve" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="016C"/>
   <outline>
     <component base="U"/>
-    <component base="brevecomb.case" xOffset="116"/>
+    <component base="brevecomb.case" xOffset="126"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_caron.glif b/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
index 39a202ad..1f3df091 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucaron" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="01D3"/>
   <outline>
     <component base="U"/>
-    <component base="caroncomb.case" xOffset="135"/>
+    <component base="caroncomb.case" xOffset="145"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
index 068a7756..4bcb870f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ucircumflex" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="00DB"/>
   <outline>
     <component base="U"/>
-    <component base="circumflexcomb.case" xOffset="150"/>
+    <component base="circumflexcomb.case" xOffset="160"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
index d4600d70..b5420923 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udblgrave" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0214"/>
   <outline>
     <component base="U"/>
-    <component base="dblgravecomb.case" xOffset="66"/>
+    <component base="dblgravecomb.case" xOffset="76"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
index d7b448bb..9e505028 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresis" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="00DC"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="74"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
index b307ec47..8ec2e67a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresisacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisacute" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="01D7"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="74"/>
-    <component base="acutecomb.case" xOffset="270" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
+    <component base="acutecomb.case" xOffset="280" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
index 20cd2045..e660041d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresiscaron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresiscaron" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="01D9"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="74"/>
-    <component base="caroncomb.case" xOffset="135" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
+    <component base="caroncomb.case" xOffset="145" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
index 27cc490b..e139e8d1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresisgrave.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresisgrave" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="01DB"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="74"/>
-    <component base="gravecomb.case" xOffset="120" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
+    <component base="gravecomb.case" xOffset="130" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
index 9c80fdaf..30f2994a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dieresismacron.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udieresismacron" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="01D5"/>
   <outline>
     <component base="U"/>
-    <component base="dieresiscomb.case" xOffset="74"/>
-    <component base="macroncomb.case" xOffset="110" yOffset="212"/>
+    <component base="dieresiscomb.case" xOffset="84"/>
+    <component base="macroncomb.case" xOffset="120" yOffset="212"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
index 01cf56e5..f93f6b7a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Udotbelow" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="1EE4"/>
   <outline>
     <component base="U"/>
-    <component base="dotbelowcomb" xOffset="199"/>
+    <component base="dotbelowcomb" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_grave.glif b/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
index ff0ad74d..30aca125 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ugrave" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="00D9"/>
   <outline>
     <component base="U"/>
-    <component base="gravecomb.case" xOffset="120"/>
+    <component base="gravecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
index fcefa007..ec04ccf5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhookabove" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="1EE6"/>
   <outline>
     <component base="U"/>
-    <component base="hookabovecomb.case" xOffset="194"/>
+    <component base="hookabovecomb.case" xOffset="204"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
index dc722108..db745952 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horn.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorn" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="01AF"/>
   <outline>
     <component base="U"/>
-    <component base="horncomb" xOffset="581" yOffset="212"/>
+    <component base="horncomb" xOffset="591" yOffset="212"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
index 9ee396d1..28625212 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hornacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornacute" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="1EE8"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="acutecomb.case" xOffset="270"/>
+    <component base="acutecomb.case" xOffset="280"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
index 653e243c..d9216961 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horndotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorndotbelow" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="1EF0"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="dotbelowcomb" xOffset="199"/>
+    <component base="dotbelowcomb" xOffset="209"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif b/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
index 35d78e29..3eacff0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horngrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorngrave" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="1EEA"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="gravecomb.case" xOffset="120"/>
+    <component base="gravecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
index 0dac413c..e150d23d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hornhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhornhookabove" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="1EEC"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="hookabovecomb.case" xOffset="194"/>
+    <component base="hookabovecomb.case" xOffset="204"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif b/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
index 6ab60040..1c8ad738 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_horntilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhorntilde" format="2">
-  <advance width="863"/>
+  <advance width="883"/>
   <unicode hex="1EEE"/>
   <outline>
     <component base="Uhorn"/>
-    <component base="tildecomb.case" xOffset="120"/>
+    <component base="tildecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
index 49328eb9..eb55f219 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_hungarumlaut.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uhungarumlaut" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0170"/>
   <outline>
     <component base="U"/>
-    <component base="hungarumlautcomb.case" xOffset="111"/>
+    <component base="hungarumlautcomb.case" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
index 991b6ed2..c87eeb74 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uinvertedbreve" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0216"/>
   <outline>
     <component base="U"/>
-    <component base="breveinvertedcomb.case" xOffset="118"/>
+    <component base="breveinvertedcomb.case" xOffset="128"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macron.glif b/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
index 602efa7a..7a6dfe82 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacron" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="016A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="110"/>
+    <component base="macroncomb.case" xOffset="120"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
index 30a8a81d..7176bda1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_macrondieresis.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Umacrondieresis" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="1E7A"/>
   <outline>
     <component base="U"/>
-    <component base="macroncomb.case" xOffset="110"/>
-    <component base="dieresiscomb.case" xOffset="74" yOffset="208"/>
+    <component base="macroncomb.case" xOffset="120"/>
+    <component base="dieresiscomb.case" xOffset="84" yOffset="208"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif b/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
index a83cad08..2aadd656 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uogonek" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0172"/>
   <outline>
     <component base="U"/>
-    <component base="ogonekcomb.tall.case" xOffset="-15"/>
+    <component base="ogonekcomb.tall.case" xOffset="-5"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_ring.glif b/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
index 0bdd1a74..5cab54b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_ring.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Uring" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="016E"/>
   <outline>
     <component base="U"/>
-    <component base="ringcomb.case" xOffset="183"/>
+    <component base="ringcomb.case" xOffset="193"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
index da03a39c..4d072f39 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_straight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraight-cy" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="04AE"/>
   <anchor x="334" y="233" name="center"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
index 28f110c6..7f8ad7d6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_straightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ustraightstroke-cy" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="04B0"/>
   <outline>
     <component base="Ustraight-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
index a42fb008..85223fe9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utilde" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="0168"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="120"/>
+    <component base="tildecomb.case" xOffset="130"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif b/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
index fe022095..a96eb570 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_tildeacute.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Utildeacute" format="2">
-  <advance width="698"/>
+  <advance width="718"/>
   <unicode hex="1E78"/>
   <outline>
     <component base="U"/>
-    <component base="tildecomb.case" xOffset="120"/>
-    <component base="acutecomb.case" xOffset="270" yOffset="245"/>
+    <component base="tildecomb.case" xOffset="130"/>
+    <component base="acutecomb.case" xOffset="280" yOffset="245"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_.glif b/src/Cantarell-Bold.ufo/glyphs/V_.glif
index c43a8c30..9570d041 100644
--- a/src/Cantarell-Bold.ufo/glyphs/V_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/V_.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="V" format="2">
-  <advance width="673"/>
+  <advance width="675"/>
   <unicode hex="0056"/>
   <note>
 V
 </note>
-  <anchor x="337" y="0" name="bottom"/>
-  <anchor x="337" y="694" name="top"/>
+  <anchor x="338" y="0" name="bottom"/>
+  <anchor x="338" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="243" y="0" type="line"/>
-      <point x="428" y="0" type="line"/>
-      <point x="675" y="694" type="line"/>
-      <point x="496" y="694" type="line"/>
-      <point x="307" y="92" type="line"/>
-      <point x="376" y="92" type="line"/>
-      <point x="200" y="694" type="line"/>
-      <point x="-2" y="694" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="429" y="0" type="line"/>
+      <point x="676" y="694" type="line"/>
+      <point x="497" y="694" type="line"/>
+      <point x="308" y="92" type="line"/>
+      <point x="377" y="92" type="line"/>
+      <point x="201" y="694" type="line"/>
+      <point x="-1" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
index 0847819d..adc56bf1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/V_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ve-cy" format="2">
-  <advance width="638"/>
+  <advance width="670"/>
   <unicode hex="0412"/>
   <outline>
     <component base="B"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_.glif b/src/Cantarell-Bold.ufo/glyphs/W_.glif
index 959a27de..f26fc90a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_.glif
@@ -1,30 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="W" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="0057"/>
   <note>
 W
 </note>
-  <anchor x="510" y="0" name="bottom"/>
-  <anchor x="510" y="694" name="top"/>
+  <anchor x="507" y="0" name="bottom"/>
+  <anchor x="507" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="200" y="0" type="line"/>
-      <point x="390" y="0" type="line"/>
-      <point x="548" y="602" type="line"/>
-      <point x="468" y="602" type="line"/>
-      <point x="642" y="0" type="line"/>
-      <point x="827" y="0" type="line"/>
-      <point x="1026" y="694" type="line"/>
-      <point x="851" y="694" type="line"/>
-      <point x="705" y="85" type="line"/>
-      <point x="772" y="109" type="line"/>
-      <point x="613" y="690" type="line"/>
-      <point x="424" y="690" type="line"/>
-      <point x="275" y="105" type="line"/>
-      <point x="327" y="105" type="line"/>
-      <point x="195" y="694" type="line"/>
-      <point x="0" y="694" type="line"/>
+      <point x="197" y="0" type="line"/>
+      <point x="387" y="0" type="line"/>
+      <point x="545" y="602" type="line"/>
+      <point x="465" y="602" type="line"/>
+      <point x="639" y="0" type="line"/>
+      <point x="824" y="0" type="line"/>
+      <point x="1023" y="694" type="line"/>
+      <point x="848" y="694" type="line"/>
+      <point x="702" y="85" type="line"/>
+      <point x="769" y="109" type="line"/>
+      <point x="610" y="690" type="line"/>
+      <point x="421" y="690" type="line"/>
+      <point x="272" y="105" type="line"/>
+      <point x="324" y="105" type="line"/>
+      <point x="192" y="694" type="line"/>
+      <point x="-3" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_acute.glif b/src/Cantarell-Bold.ufo/glyphs/W_acute.glif
index 71d54963..30800503 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wacute" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="1E82"/>
   <outline>
     <component base="W"/>
-    <component base="acutecomb.case" xOffset="431"/>
+    <component base="acutecomb.case" xOffset="428"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/W_circumflex.glif
index f72bba07..6c0c80cc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wcircumflex" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="0174"/>
   <outline>
     <component base="W"/>
-    <component base="circumflexcomb.case" xOffset="311"/>
+    <component base="circumflexcomb.case" xOffset="308"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/W_dieresis.glif
index 5ff33c93..40bdd218 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wdieresis" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="1E84"/>
   <outline>
     <component base="W"/>
-    <component base="dieresiscomb.case" xOffset="235"/>
+    <component base="dieresiscomb.case" xOffset="232"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_e-cy.glif b/src/Cantarell-Bold.ufo/glyphs/W_e-cy.glif
index f4340797..2b4530f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_e-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_e-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="We-cy" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="051C"/>
   <outline>
     <component base="W"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/W_grave.glif b/src/Cantarell-Bold.ufo/glyphs/W_grave.glif
index c1f260db..4eac3ccc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/W_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/W_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Wgrave" format="2">
-  <advance width="1026"/>
+  <advance width="1020"/>
   <unicode hex="1E80"/>
   <outline>
     <component base="W"/>
-    <component base="gravecomb.case" xOffset="281"/>
+    <component base="gravecomb.case" xOffset="278"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/X_.glif b/src/Cantarell-Bold.ufo/glyphs/X_.glif
index a7976c92..62822c3d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/X_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/X_.glif
@@ -1,32 +1,32 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="X" format="2">
-  <advance width="674"/>
+  <advance width="652"/>
   <unicode hex="0058"/>
   <note>
 X
 </note>
-  <anchor x="355" y="0" name="bottom"/>
-  <anchor x="343" y="694" name="top"/>
+  <anchor x="344" y="0" name="bottom"/>
+  <anchor x="332" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="470" y="0" type="line"/>
-      <point x="679" y="0" type="line"/>
-      <point x="387" y="416" type="line"/>
-      <point x="216" y="694" type="line"/>
-      <point x="11" y="694" type="line"/>
-      <point x="296" y="279" type="line"/>
+      <point x="459" y="0" type="line"/>
+      <point x="668" y="0" type="line"/>
+      <point x="376" y="416" type="line"/>
+      <point x="205" y="694" type="line"/>
+      <point x="0" y="694" type="line"/>
+      <point x="285" y="279" type="line"/>
     </contour>
     <contour>
-      <point x="-5" y="0" type="line"/>
-      <point x="196" y="0" type="line"/>
-      <point x="331" y="233" type="line"/>
-      <point x="246" y="372" type="line"/>
+      <point x="-16" y="0" type="line"/>
+      <point x="185" y="0" type="line"/>
+      <point x="320" y="233" type="line"/>
+      <point x="235" y="372" type="line"/>
     </contour>
     <contour>
-      <point x="409" y="349" type="line"/>
-      <point x="651" y="694" type="line"/>
-      <point x="448" y="694" type="line"/>
-      <point x="319" y="484" type="line"/>
+      <point x="398" y="349" type="line"/>
+      <point x="640" y="694" type="line"/>
+      <point x="437" y="694" type="line"/>
+      <point x="308" y="484" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_.glif b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
index 6fc13fe4..0d0cf25b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Y" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="0059"/>
   <note>
 Y
 </note>
-  <anchor x="321" y="0" name="bottom"/>
-  <anchor x="321" y="694" name="top"/>
-  <anchor x="4" y="694" name="topleft"/>
+  <anchor x="334" y="0" name="bottom"/>
+  <anchor x="334" y="694" name="top"/>
+  <anchor x="17" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="243" y="0" type="line"/>
-      <point x="415" y="0" type="line"/>
-      <point x="415" y="247" type="line"/>
-      <point x="667" y="694" type="line"/>
-      <point x="473" y="694" type="line"/>
-      <point x="324" y="380" type="line"/>
-      <point x="345" y="380" type="line"/>
-      <point x="184" y="694" type="line"/>
-      <point x="-20" y="694" type="line"/>
-      <point x="243" y="251" type="line"/>
+      <point x="256" y="0" type="line"/>
+      <point x="428" y="0" type="line"/>
+      <point x="428" y="247" type="line"/>
+      <point x="680" y="694" type="line"/>
+      <point x="486" y="694" type="line"/>
+      <point x="337" y="380" type="line"/>
+      <point x="358" y="380" type="line"/>
+      <point x="197" y="694" type="line"/>
+      <point x="-7" y="694" type="line"/>
+      <point x="256" y="251" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif b/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
index bb9aef0b..d0197cc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yacute" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="00DD"/>
   <outline>
     <component base="Y"/>
-    <component base="acutecomb.case" xOffset="242"/>
+    <component base="acutecomb.case" xOffset="255"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif b/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
index 393a4f88..e3e207fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ycircumflex" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="0176"/>
   <outline>
     <component base="Y"/>
-    <component base="circumflexcomb.case" xOffset="122"/>
+    <component base="circumflexcomb.case" xOffset="135"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
index 51c244fb..b687f421 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydieresis" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="0178"/>
   <outline>
     <component base="Y"/>
-    <component base="dieresiscomb.case" xOffset="46"/>
+    <component base="dieresiscomb.case" xOffset="59"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
index 18cdffa2..32b27d0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotaccent" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="1E8E"/>
   <outline>
     <component base="Y"/>
-    <component base="dotaccentcomb.case" xOffset="176"/>
+    <component base="dotaccentcomb.case" xOffset="189"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
index 914bb638..cd4ab424 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ydotbelow" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="1EF4"/>
   <outline>
     <component base="Y"/>
-    <component base="dotbelowcomb" xOffset="171"/>
+    <component base="dotbelowcomb" xOffset="184"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif b/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
index 75472811..fc3571da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_grave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ygrave" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="1EF2"/>
   <outline>
     <component base="Y"/>
-    <component base="gravecomb.case" xOffset="92"/>
+    <component base="gravecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif b/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
index c6ab3cee..7e321495 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Yhookabove" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="1EF6"/>
   <outline>
     <component base="Y"/>
-    <component base="hookabovecomb.case" xOffset="166"/>
+    <component base="hookabovecomb.case" xOffset="179"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_i-cy.glif
index 8bdeade5..7904f719 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="286"/>
+  <advance width="318"/>
   <unicode hex="0407"/>
   <outline>
     <component base="I"/>
-    <component base="dieresiscomb.case" xOffset="-132"/>
+    <component base="dieresiscomb.case" xOffset="-116"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif b/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
index 811a4c17..b2a86cd7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_macron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ymacron" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="0232"/>
   <outline>
     <component base="Y"/>
-    <component base="macroncomb.case" xOffset="82"/>
+    <component base="macroncomb.case" xOffset="95"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif b/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
index 61ccef4f..86b733f8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Ytilde" format="2">
-  <advance width="647"/>
+  <advance width="673"/>
   <unicode hex="1EF8"/>
   <outline>
     <component base="Y"/>
-    <component base="tildecomb.case" xOffset="92"/>
+    <component base="tildecomb.case" xOffset="105"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_.glif b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
index 85579f50..96dff785 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_.glif
@@ -1,26 +1,26 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Z" format="2">
-  <advance width="646"/>
+  <advance width="658"/>
   <unicode hex="005A"/>
   <note>
 Z
 </note>
-  <anchor x="331" y="0" name="bottom"/>
-  <anchor x="331" y="694" name="top"/>
+  <anchor x="335" y="0" name="bottom"/>
+  <anchor x="335" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="22" y="0" type="line"/>
-      <point x="625" y="0" type="line"/>
-      <point x="625" y="152" type="line"/>
-      <point x="168" y="152" type="line"/>
-      <point x="209" y="94" type="line"/>
-      <point x="620" y="591" type="line"/>
-      <point x="620" y="694" type="line"/>
-      <point x="40" y="694" type="line"/>
-      <point x="40" y="542" type="line"/>
-      <point x="484" y="542" type="line"/>
-      <point x="432" y="608" type="line"/>
-      <point x="22" y="111" type="line"/>
+      <point x="26" y="0" type="line"/>
+      <point x="629" y="0" type="line"/>
+      <point x="629" y="152" type="line"/>
+      <point x="172" y="152" type="line"/>
+      <point x="213" y="94" type="line"/>
+      <point x="624" y="591" type="line"/>
+      <point x="624" y="694" type="line"/>
+      <point x="44" y="694" type="line"/>
+      <point x="44" y="542" type="line"/>
+      <point x="488" y="542" type="line"/>
+      <point x="436" y="608" type="line"/>
+      <point x="26" y="111" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif b/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
index 3a6f2e02..054735fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_acute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zacute" format="2">
-  <advance width="646"/>
+  <advance width="658"/>
   <unicode hex="0179"/>
   <outline>
     <component base="Z"/>
-    <component base="acutecomb.case" xOffset="252"/>
+    <component base="acutecomb.case" xOffset="256"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif b/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
index 16fc084c..a497e864 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_caron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zcaron" format="2">
-  <advance width="646"/>
+  <advance width="658"/>
   <unicode hex="017D"/>
   <outline>
     <component base="Z"/>
-    <component base="caroncomb.case" xOffset="117"/>
+    <component base="caroncomb.case" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
index b6d83807..060db146 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_dotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotaccent" format="2">
-  <advance width="646"/>
+  <advance width="658"/>
   <unicode hex="017B"/>
   <outline>
     <component base="Z"/>
-    <component base="dotaccentcomb.case" xOffset="186"/>
+    <component base="dotaccentcomb.case" xOffset="190"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
index bebc6fc5..175779bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zdotbelow" format="2">
-  <advance width="646"/>
+  <advance width="658"/>
   <unicode hex="1E92"/>
   <outline>
     <component base="Z"/>
-    <component base="dotbelowcomb" xOffset="181"/>
+    <component base="dotbelowcomb" xOffset="185"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/bar.glif b/src/Cantarell-Bold.ufo/glyphs/bar.glif
index ea83b939..623f8512 100644
--- a/src/Cantarell-Bold.ufo/glyphs/bar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/bar.glif
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="bar" format="2">
-  <advance width="275"/>
+  <advance width="307"/>
   <unicode hex="007C"/>
   <outline>
     <contour>
-      <point x="55" y="-180" type="line"/>
-      <point x="220" y="-180" type="line"/>
-      <point x="220" y="739" type="line"/>
-      <point x="55" y="739" type="line"/>
+      <point x="71" y="-180" type="line"/>
+      <point x="236" y="-180" type="line"/>
+      <point x="236" y="739" type="line"/>
+      <point x="71" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif b/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
index fe975808..071a4984 100644
--- a/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/brokenbar.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="brokenbar" format="2">
-  <advance width="280"/>
+  <advance width="312"/>
   <unicode hex="00A6"/>
   <outline>
     <contour>
-      <point x="55" y="-184" type="line"/>
-      <point x="225" y="-184" type="line"/>
-      <point x="225" y="181" type="line"/>
-      <point x="55" y="181" type="line"/>
+      <point x="71" y="-184" type="line"/>
+      <point x="241" y="-184" type="line"/>
+      <point x="241" y="181" type="line"/>
+      <point x="71" y="181" type="line"/>
     </contour>
     <contour>
-      <point x="55" y="412" type="line"/>
-      <point x="225" y="412" type="line"/>
-      <point x="225" y="743" type="line"/>
-      <point x="55" y="743" type="line"/>
+      <point x="71" y="412" type="line"/>
+      <point x="241" y="412" type="line"/>
+      <point x="241" y="743" type="line"/>
+      <point x="71" y="743" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eight.glif b/src/Cantarell-Bold.ufo/glyphs/eight.glif
index 8a174db2..ef046f77 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eight.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eight.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eight" format="2">
-  <advance width="595"/>
+  <advance width="609"/>
   <unicode hex="0038"/>
   <outline>
     <contour>
-      <point x="294" y="-10" type="curve" smooth="yes"/>
-      <point x="464" y="-10"/>
-      <point x="576" y="76"/>
-      <point x="576" y="203" type="curve" smooth="yes"/>
-      <point x="576" y="429"/>
-      <point x="208" y="374"/>
-      <point x="208" y="502" type="curve" smooth="yes"/>
-      <point x="208" y="539"/>
-      <point x="242" y="566"/>
-      <point x="296" y="566" type="curve" smooth="yes"/>
-      <point x="350" y="566"/>
-      <point x="385" y="539"/>
-      <point x="385" y="497" type="curve" smooth="yes"/>
-      <point x="385" y="454"/>
-      <point x="347" y="424"/>
-      <point x="291" y="419" type="curve"/>
-      <point x="408" y="359" type="line"/>
-      <point x="501" y="393"/>
-      <point x="553" y="455"/>
-      <point x="553" y="529" type="curve" smooth="yes"/>
-      <point x="553" y="634"/>
-      <point x="451" y="704"/>
-      <point x="305" y="704" type="curve" smooth="yes"/>
-      <point x="145" y="704"/>
-      <point x="40" y="619"/>
-      <point x="40" y="493" type="curve" smooth="yes"/>
-      <point x="40" y="262"/>
-      <point x="408" y="316"/>
-      <point x="408" y="193" type="curve" smooth="yes"/>
-      <point x="408" y="155"/>
-      <point x="369" y="128"/>
-      <point x="305" y="128" type="curve" smooth="yes"/>
-      <point x="235" y="128"/>
-      <point x="189" y="162"/>
-      <point x="189" y="215" type="curve" smooth="yes"/>
-      <point x="189" y="264"/>
-      <point x="229" y="292"/>
-      <point x="299" y="294" type="curve"/>
-      <point x="200" y="357" type="line"/>
-      <point x="88" y="337"/>
-      <point x="21" y="273"/>
-      <point x="21" y="183" type="curve" smooth="yes"/>
-      <point x="21" y="68"/>
-      <point x="132" y="-10"/>
+      <point x="301" y="-10" type="curve" smooth="yes"/>
+      <point x="471" y="-10"/>
+      <point x="583" y="76"/>
+      <point x="583" y="203" type="curve" smooth="yes"/>
+      <point x="583" y="429"/>
+      <point x="215" y="374"/>
+      <point x="215" y="502" type="curve" smooth="yes"/>
+      <point x="215" y="539"/>
+      <point x="249" y="566"/>
+      <point x="303" y="566" type="curve" smooth="yes"/>
+      <point x="357" y="566"/>
+      <point x="392" y="539"/>
+      <point x="392" y="497" type="curve" smooth="yes"/>
+      <point x="392" y="454"/>
+      <point x="354" y="424"/>
+      <point x="298" y="419" type="curve"/>
+      <point x="415" y="359" type="line"/>
+      <point x="508" y="393"/>
+      <point x="560" y="455"/>
+      <point x="560" y="529" type="curve" smooth="yes"/>
+      <point x="560" y="634"/>
+      <point x="458" y="704"/>
+      <point x="312" y="704" type="curve" smooth="yes"/>
+      <point x="152" y="704"/>
+      <point x="47" y="619"/>
+      <point x="47" y="493" type="curve" smooth="yes"/>
+      <point x="47" y="262"/>
+      <point x="415" y="316"/>
+      <point x="415" y="193" type="curve" smooth="yes"/>
+      <point x="415" y="155"/>
+      <point x="376" y="128"/>
+      <point x="312" y="128" type="curve" smooth="yes"/>
+      <point x="242" y="128"/>
+      <point x="196" y="162"/>
+      <point x="196" y="215" type="curve" smooth="yes"/>
+      <point x="196" y="264"/>
+      <point x="236" y="292"/>
+      <point x="306" y="294" type="curve"/>
+      <point x="207" y="357" type="line"/>
+      <point x="95" y="337"/>
+      <point x="28" y="273"/>
+      <point x="28" y="183" type="curve" smooth="yes"/>
+      <point x="28" y="68"/>
+      <point x="139" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/five.glif b/src/Cantarell-Bold.ufo/glyphs/five.glif
index 0f59132d..de272e70 100644
--- a/src/Cantarell-Bold.ufo/glyphs/five.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/five.glif
@@ -1,40 +1,40 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="five" format="2">
-  <advance width="558"/>
+  <advance width="574"/>
   <unicode hex="0035"/>
   <outline>
     <contour>
-      <point x="239" y="-10" type="curve" smooth="yes"/>
-      <point x="422" y="-10"/>
-      <point x="539" y="80"/>
-      <point x="539" y="230" type="curve" smooth="yes"/>
-      <point x="539" y="362"/>
-      <point x="445" y="436"/>
-      <point x="277" y="436" type="curve" smooth="yes"/>
-      <point x="234" y="436"/>
-      <point x="212" y="431"/>
-      <point x="192" y="418" type="curve"/>
-      <point x="235" y="365" type="line"/>
-      <point x="243" y="543" type="line"/>
-      <point x="502" y="543" type="line"/>
-      <point x="502" y="694" type="line"/>
-      <point x="74" y="694" type="line"/>
-      <point x="56" y="287" type="line"/>
-      <point x="99" y="295"/>
-      <point x="154" y="301"/>
-      <point x="195" y="301" type="curve" smooth="yes"/>
-      <point x="299" y="301"/>
-      <point x="359" y="268"/>
-      <point x="359" y="212" type="curve" smooth="yes"/>
-      <point x="359" y="165"/>
-      <point x="316" y="140"/>
-      <point x="238" y="140" type="curve" smooth="yes"/>
-      <point x="178" y="140"/>
-      <point x="111" y="154"/>
-      <point x="61" y="178" type="curve"/>
-      <point x="14" y="42" type="line"/>
-      <point x="81" y="8"/>
-      <point x="157" y="-10"/>
+      <point x="247" y="-10" type="curve" smooth="yes"/>
+      <point x="430" y="-10"/>
+      <point x="547" y="80"/>
+      <point x="547" y="230" type="curve" smooth="yes"/>
+      <point x="547" y="362"/>
+      <point x="453" y="436"/>
+      <point x="285" y="436" type="curve" smooth="yes"/>
+      <point x="242" y="436"/>
+      <point x="220" y="431"/>
+      <point x="200" y="418" type="curve"/>
+      <point x="243" y="365" type="line"/>
+      <point x="251" y="543" type="line"/>
+      <point x="510" y="543" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="82" y="694" type="line"/>
+      <point x="64" y="287" type="line"/>
+      <point x="107" y="295"/>
+      <point x="162" y="301"/>
+      <point x="203" y="301" type="curve" smooth="yes"/>
+      <point x="307" y="301"/>
+      <point x="367" y="268"/>
+      <point x="367" y="212" type="curve" smooth="yes"/>
+      <point x="367" y="165"/>
+      <point x="324" y="140"/>
+      <point x="246" y="140" type="curve" smooth="yes"/>
+      <point x="186" y="140"/>
+      <point x="119" y="154"/>
+      <point x="69" y="178" type="curve"/>
+      <point x="22" y="42" type="line"/>
+      <point x="89" y="8"/>
+      <point x="165" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/four.glif b/src/Cantarell-Bold.ufo/glyphs/four.glif
index 0bbaf319..467bb424 100644
--- a/src/Cantarell-Bold.ufo/glyphs/four.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/four.glif
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="four" format="2">
-  <advance width="609"/>
+  <advance width="635"/>
   <unicode hex="0034"/>
   <outline>
     <contour>
-      <point x="316" y="-5" type="line"/>
-      <point x="485" y="-5" type="line"/>
-      <point x="485" y="694" type="line"/>
-      <point x="321" y="694" type="line"/>
-      <point x="-2" y="215" type="line"/>
-      <point x="-2" y="124" type="line"/>
-      <point x="607" y="124" type="line"/>
-      <point x="607" y="270" type="line"/>
-      <point x="86" y="272" type="line"/>
-      <point x="136" y="217" type="line"/>
-      <point x="337" y="534" type="line"/>
-      <point x="316" y="583" type="line"/>
+      <point x="329" y="-5" type="line"/>
+      <point x="498" y="-5" type="line"/>
+      <point x="498" y="694" type="line"/>
+      <point x="334" y="694" type="line"/>
+      <point x="11" y="215" type="line"/>
+      <point x="11" y="124" type="line"/>
+      <point x="620" y="124" type="line"/>
+      <point x="620" y="270" type="line"/>
+      <point x="99" y="272" type="line"/>
+      <point x="149" y="217" type="line"/>
+      <point x="350" y="534" type="line"/>
+      <point x="329" y="583" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
index 58ff735c..31c71896 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ha-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ha-cy" format="2">
-  <advance width="531"/>
+  <advance width="527"/>
   <unicode hex="0445"/>
   <anchor x="374" y="0" name="bottomright"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif b/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
index 12ac07a6..42a0061a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/izhitsa-cy.glif
@@ -1,23 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="izhitsa-cy" format="2">
-  <advance width="529"/>
+  <advance width="527"/>
   <unicode hex="0475"/>
   <outline>
     <contour>
-      <point x="166" y="0" type="line"/>
-      <point x="335" y="0" type="line"/>
-      <point x="426" y="282" type="line" smooth="yes"/>
-      <point x="439" y="322"/>
-      <point x="467" y="346"/>
-      <point x="528" y="346" type="curve"/>
-      <point x="509" y="493" type="line"/>
-      <point x="393" y="493"/>
-      <point x="319" y="443"/>
-      <point x="296" y="350" type="curve" smooth="yes"/>
-      <point x="239" y="122" type="line"/>
-      <point x="274" y="122" type="line"/>
-      <point x="180" y="486" type="line"/>
-      <point x="-3" y="486" type="line"/>
+      <point x="164" y="0" type="line"/>
+      <point x="333" y="0" type="line"/>
+      <point x="424" y="282" type="line" smooth="yes"/>
+      <point x="437" y="322"/>
+      <point x="465" y="346"/>
+      <point x="526" y="346" type="curve"/>
+      <point x="507" y="493" type="line"/>
+      <point x="391" y="493"/>
+      <point x="317" y="443"/>
+      <point x="294" y="350" type="curve" smooth="yes"/>
+      <point x="237" y="122" type="line"/>
+      <point x="272" y="122" type="line"/>
+      <point x="178" y="486" type="line"/>
+      <point x="-5" y="486" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/k.glif b/src/Cantarell-Bold.ufo/glyphs/k.glif
index c934c1cc..05d9e465 100644
--- a/src/Cantarell-Bold.ufo/glyphs/k.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/k.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="k" format="2">
-  <advance width="587"/>
+  <advance width="583"/>
   <unicode hex="006B"/>
   <note>
 k
diff --git a/src/Cantarell-Bold.ufo/glyphs/kacute.glif b/src/Cantarell-Bold.ufo/glyphs/kacute.glif
index 5779dda5..13af8665 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kacute.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kacute" format="2">
-  <advance width="587"/>
+  <advance width="583"/>
   <unicode hex="1E31"/>
   <outline>
     <component base="k"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif b/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
index e33b96e6..8407eb55 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kcommaaccent.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kcommaaccent" format="2">
-  <advance width="587"/>
+  <advance width="583"/>
   <unicode hex="0137"/>
   <outline>
     <component base="k"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
index 14ed78b7..70390fc6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="587"/>
+  <advance width="583"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.glif b/src/Cantarell-Bold.ufo/glyphs/nine.glif
index afd4d52a..b30c2d69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.glif
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nine" format="2">
-  <advance width="590"/>
+  <advance width="604"/>
   <unicode hex="0039"/>
   <outline>
-    <component base="six" xScale="-1" yScale="-1" xOffset="590" yOffset="694"/>
+    <component base="six" xScale="-1" yScale="-1" xOffset="597" yOffset="694"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/numero.glif b/src/Cantarell-Bold.ufo/glyphs/numero.glif
index 64ba5372..71c2c239 100644
--- a/src/Cantarell-Bold.ufo/glyphs/numero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/numero.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="numero" format="2">
-  <advance width="1184"/>
+  <advance width="1216"/>
   <unicode hex="2116"/>
   <outline>
     <component base="N"/>
-    <component base="ordmasculine" xOffset="756"/>
+    <component base="ordmasculine" xOffset="788"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/one.glif b/src/Cantarell-Bold.ufo/glyphs/one.glif
index cb0494f5..30875b9b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/one.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/one.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="one" format="2">
-  <advance width="459"/>
+  <advance width="452"/>
   <unicode hex="0031"/>
   <outline>
     <contour>
diff --git a/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif b/src/Cantarell-Bold.ufo/glyphs/palochka-cy.glif
index dd5c7a2e..4e5c9c64 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="286"/>
+  <advance width="318"/>
   <unicode hex="04CF"/>
   <outline>
     <component base="I"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/seven.glif b/src/Cantarell-Bold.ufo/glyphs/seven.glif
index 12928ab6..ed0ab211 100644
--- a/src/Cantarell-Bold.ufo/glyphs/seven.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/seven.glif
@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="seven" format="2">
-  <advance width="520"/>
+  <advance width="535"/>
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="57" y="0" type="line"/>
-      <point x="240" y="0" type="line"/>
-      <point x="519" y="612" type="line"/>
-      <point x="519" y="694" type="line"/>
-      <point x="4" y="694" type="line"/>
-      <point x="4" y="544" type="line"/>
-      <point x="366" y="544" type="line"/>
-      <point x="330" y="589" type="line"/>
+      <point x="65" y="0" type="line"/>
+      <point x="248" y="0" type="line"/>
+      <point x="527" y="612" type="line"/>
+      <point x="527" y="694" type="line"/>
+      <point x="12" y="694" type="line"/>
+      <point x="12" y="544" type="line"/>
+      <point x="374" y="544" type="line"/>
+      <point x="338" y="589" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/six.glif b/src/Cantarell-Bold.ufo/glyphs/six.glif
index 21fb56fb..f33e1f35 100644
--- a/src/Cantarell-Bold.ufo/glyphs/six.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/six.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="six" format="2">
-  <advance width="589"/>
+  <advance width="604"/>
   <unicode hex="0036"/>
   <outline>
     <contour>
-      <point x="302" y="-10" type="curve" smooth="yes"/>
-      <point x="462" y="-10"/>
-      <point x="568" y="87"/>
-      <point x="568" y="232" type="curve" smooth="yes"/>
-      <point x="568" y="362"/>
-      <point x="485" y="446"/>
-      <point x="361" y="446" type="curve" smooth="yes"/>
-      <point x="269" y="446"/>
-      <point x="196" y="402"/>
-      <point x="153" y="315" type="curve"/>
-      <point x="196" y="255" type="line"/>
-      <point x="225" y="289"/>
-      <point x="266" y="309"/>
-      <point x="307" y="309" type="curve" smooth="yes"/>
-      <point x="363" y="309"/>
-      <point x="400" y="273"/>
-      <point x="400" y="219" type="curve" smooth="yes"/>
-      <point x="400" y="167"/>
-      <point x="366" y="133"/>
-      <point x="314" y="133" type="curve" smooth="yes"/>
-      <point x="238" y="133"/>
-      <point x="195" y="211"/>
-      <point x="195" y="344" type="curve" smooth="yes"/>
-      <point x="195" y="487"/>
-      <point x="256" y="564"/>
-      <point x="370" y="564" type="curve" smooth="yes"/>
-      <point x="415" y="564"/>
-      <point x="472" y="552"/>
-      <point x="513" y="534" type="curve"/>
-      <point x="557" y="663" type="line"/>
-      <point x="504" y="689"/>
-      <point x="438" y="704"/>
-      <point x="363" y="704" type="curve" smooth="yes"/>
-      <point x="142" y="704"/>
-      <point x="25" y="569"/>
-      <point x="25" y="330" type="curve" smooth="yes"/>
-      <point x="25" y="107"/>
-      <point x="126" y="-10"/>
+      <point x="309" y="-10" type="curve" smooth="yes"/>
+      <point x="469" y="-10"/>
+      <point x="575" y="87"/>
+      <point x="575" y="232" type="curve" smooth="yes"/>
+      <point x="575" y="362"/>
+      <point x="492" y="446"/>
+      <point x="368" y="446" type="curve" smooth="yes"/>
+      <point x="276" y="446"/>
+      <point x="203" y="402"/>
+      <point x="160" y="315" type="curve"/>
+      <point x="203" y="255" type="line"/>
+      <point x="232" y="289"/>
+      <point x="273" y="309"/>
+      <point x="314" y="309" type="curve" smooth="yes"/>
+      <point x="370" y="309"/>
+      <point x="407" y="273"/>
+      <point x="407" y="219" type="curve" smooth="yes"/>
+      <point x="407" y="167"/>
+      <point x="373" y="133"/>
+      <point x="321" y="133" type="curve" smooth="yes"/>
+      <point x="245" y="133"/>
+      <point x="202" y="211"/>
+      <point x="202" y="344" type="curve" smooth="yes"/>
+      <point x="202" y="487"/>
+      <point x="263" y="564"/>
+      <point x="377" y="564" type="curve" smooth="yes"/>
+      <point x="422" y="564"/>
+      <point x="479" y="552"/>
+      <point x="520" y="534" type="curve"/>
+      <point x="564" y="663" type="line"/>
+      <point x="511" y="689"/>
+      <point x="445" y="704"/>
+      <point x="370" y="704" type="curve" smooth="yes"/>
+      <point x="149" y="704"/>
+      <point x="32" y="569"/>
+      <point x="32" y="330" type="curve" smooth="yes"/>
+      <point x="32" y="107"/>
+      <point x="133" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/three.glif b/src/Cantarell-Bold.ufo/glyphs/three.glif
index 671b7fcc..87cca768 100644
--- a/src/Cantarell-Bold.ufo/glyphs/three.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/three.glif
@@ -1,51 +1,51 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="three" format="2">
-  <advance width="556"/>
+  <advance width="572"/>
   <unicode hex="0033"/>
   <outline>
     <contour>
-      <point x="232" y="-10" type="curve" smooth="yes"/>
-      <point x="419" y="-10"/>
-      <point x="542" y="71"/>
-      <point x="542" y="194" type="curve" smooth="yes"/>
-      <point x="542" y="290"/>
-      <point x="471" y="360"/>
-      <point x="364" y="370" type="curve"/>
-      <point x="338" y="360" type="line"/>
-      <point x="438" y="359"/>
-      <point x="503" y="422"/>
-      <point x="503" y="518" type="curve" smooth="yes"/>
-      <point x="503" y="634"/>
-      <point x="411" y="704"/>
-      <point x="257" y="704" type="curve" smooth="yes"/>
-      <point x="175" y="704"/>
-      <point x="93" y="684"/>
-      <point x="17" y="643" type="curve"/>
-      <point x="56" y="514" type="line"/>
-      <point x="118" y="541"/>
-      <point x="172" y="556"/>
-      <point x="221" y="556" type="curve" smooth="yes"/>
-      <point x="283" y="556"/>
-      <point x="323" y="532"/>
-      <point x="323" y="492" type="curve" smooth="yes"/>
-      <point x="323" y="446"/>
-      <point x="272" y="415"/>
-      <point x="196" y="415" type="curve" smooth="yes"/>
-      <point x="148" y="415" type="line"/>
-      <point x="148" y="285" type="line"/>
-      <point x="196" y="285" type="line" smooth="yes"/>
-      <point x="297" y="285"/>
-      <point x="362" y="252"/>
-      <point x="362" y="202" type="curve" smooth="yes"/>
-      <point x="362" y="161"/>
-      <point x="318" y="138"/>
-      <point x="239" y="138" type="curve" smooth="yes"/>
-      <point x="178" y="138"/>
-      <point x="110" y="151"/>
-      <point x="52" y="175" type="curve"/>
-      <point x="12" y="40" type="line"/>
-      <point x="86" y="5"/>
-      <point x="150" y="-10"/>
+      <point x="240" y="-10" type="curve" smooth="yes"/>
+      <point x="427" y="-10"/>
+      <point x="550" y="71"/>
+      <point x="550" y="194" type="curve" smooth="yes"/>
+      <point x="550" y="290"/>
+      <point x="479" y="360"/>
+      <point x="372" y="370" type="curve"/>
+      <point x="346" y="360" type="line"/>
+      <point x="446" y="359"/>
+      <point x="511" y="422"/>
+      <point x="511" y="518" type="curve" smooth="yes"/>
+      <point x="511" y="634"/>
+      <point x="419" y="704"/>
+      <point x="265" y="704" type="curve" smooth="yes"/>
+      <point x="183" y="704"/>
+      <point x="101" y="684"/>
+      <point x="25" y="643" type="curve"/>
+      <point x="64" y="514" type="line"/>
+      <point x="126" y="541"/>
+      <point x="180" y="556"/>
+      <point x="229" y="556" type="curve" smooth="yes"/>
+      <point x="291" y="556"/>
+      <point x="331" y="532"/>
+      <point x="331" y="492" type="curve" smooth="yes"/>
+      <point x="331" y="446"/>
+      <point x="280" y="415"/>
+      <point x="204" y="415" type="curve" smooth="yes"/>
+      <point x="156" y="415" type="line"/>
+      <point x="156" y="285" type="line"/>
+      <point x="204" y="285" type="line" smooth="yes"/>
+      <point x="305" y="285"/>
+      <point x="370" y="252"/>
+      <point x="370" y="202" type="curve" smooth="yes"/>
+      <point x="370" y="161"/>
+      <point x="326" y="138"/>
+      <point x="247" y="138" type="curve" smooth="yes"/>
+      <point x="186" y="138"/>
+      <point x="118" y="151"/>
+      <point x="60" y="175" type="curve"/>
+      <point x="20" y="40" type="line"/>
+      <point x="94" y="5"/>
+      <point x="158" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/two.glif b/src/Cantarell-Bold.ufo/glyphs/two.glif
index 8a3abc1a..0e319251 100644
--- a/src/Cantarell-Bold.ufo/glyphs/two.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/two.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="two" format="2">
-  <advance width="547"/>
+  <advance width="562"/>
   <unicode hex="0032"/>
   <outline>
     <contour>
-      <point x="35" y="0" type="line"/>
-      <point x="525" y="0" type="line"/>
-      <point x="525" y="150" type="line"/>
-      <point x="239" y="150" type="line"/>
-      <point x="240" y="114" type="line"/>
-      <point x="418" y="244"/>
-      <point x="507" y="368"/>
-      <point x="507" y="489" type="curve" smooth="yes"/>
-      <point x="507" y="619"/>
-      <point x="405" y="704"/>
-      <point x="248" y="704" type="curve" smooth="yes"/>
-      <point x="158" y="704"/>
-      <point x="76" y="676"/>
-      <point x="9" y="621" type="curve"/>
-      <point x="53" y="494" type="line"/>
-      <point x="109" y="533"/>
-      <point x="164" y="553"/>
-      <point x="214" y="553" type="curve" smooth="yes"/>
-      <point x="283" y="553"/>
-      <point x="327" y="516"/>
-      <point x="327" y="462" type="curve" smooth="yes"/>
-      <point x="327" y="376"/>
-      <point x="216" y="272"/>
-      <point x="35" y="122" type="curve"/>
+      <point x="42" y="0" type="line"/>
+      <point x="532" y="0" type="line"/>
+      <point x="532" y="150" type="line"/>
+      <point x="246" y="150" type="line"/>
+      <point x="247" y="114" type="line"/>
+      <point x="425" y="244"/>
+      <point x="514" y="368"/>
+      <point x="514" y="489" type="curve" smooth="yes"/>
+      <point x="514" y="619"/>
+      <point x="412" y="704"/>
+      <point x="255" y="704" type="curve" smooth="yes"/>
+      <point x="165" y="704"/>
+      <point x="83" y="676"/>
+      <point x="16" y="621" type="curve"/>
+      <point x="60" y="494" type="line"/>
+      <point x="116" y="533"/>
+      <point x="171" y="553"/>
+      <point x="221" y="553" type="curve" smooth="yes"/>
+      <point x="290" y="553"/>
+      <point x="334" y="516"/>
+      <point x="334" y="462" type="curve" smooth="yes"/>
+      <point x="334" y="376"/>
+      <point x="223" y="272"/>
+      <point x="42" y="122" type="curve"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
index a2785b78..b589c9fc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u-cy" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="0443"/>
   <anchor x="266" y="490" name="top"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
index f7b2709b..286be27f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/udieresis-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="udieresis-cy" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="04F1"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
index c240e645..0bf5a96b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/uhungarumlaut-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="uhungarumlaut-cy" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="04F3"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
index 08a9d2f1..a785a14d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/umacron-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="umacron-cy" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="04EF"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
index cc1367a4..20aab1c5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ushort-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ushort-cy" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="045E"/>
   <outline>
     <component base="u-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif
index b6194bc7..48a8c80f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ustraight-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraight-cy" format="2">
-  <advance width="545"/>
+  <advance width="541"/>
   <unicode hex="04AF"/>
   <anchor x="270" y="-53" name="center"/>
   <outline>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif
index 06f3d406..e56b8a8b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ustraightstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ustraightstroke-cy" format="2">
-  <advance width="545"/>
+  <advance width="541"/>
   <unicode hex="04B1"/>
   <outline>
     <component base="ustraight-cy"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/v.glif b/src/Cantarell-Bold.ufo/glyphs/v.glif
index 9cfd54c5..c315f417 100644
--- a/src/Cantarell-Bold.ufo/glyphs/v.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/v.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="v" format="2">
-  <advance width="545"/>
+  <advance width="541"/>
   <unicode hex="0076"/>
   <note>
 v
 </note>
-  <anchor x="270" y="0" name="bottom"/>
-  <anchor x="270" y="490" name="top"/>
+  <anchor x="268" y="0" name="bottom"/>
+  <anchor x="268" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="185" y="0" type="line"/>
-      <point x="358" y="0" type="line"/>
-      <point x="548" y="490" type="line"/>
-      <point x="374" y="490" type="line"/>
-      <point x="263" y="124" type="line"/>
-      <point x="286" y="124" type="line"/>
-      <point x="187" y="490" type="line"/>
-      <point x="-3" y="490" type="line"/>
+      <point x="183" y="0" type="line"/>
+      <point x="356" y="0" type="line"/>
+      <point x="546" y="490" type="line"/>
+      <point x="372" y="490" type="line"/>
+      <point x="261" y="124" type="line"/>
+      <point x="284" y="124" type="line"/>
+      <point x="185" y="490" type="line"/>
+      <point x="-5" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/x.glif b/src/Cantarell-Bold.ufo/glyphs/x.glif
index 040c5634..74b6893e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/x.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/x.glif
@@ -1,28 +1,28 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="x" format="2">
-  <advance width="531"/>
+  <advance width="527"/>
   <unicode hex="0078"/>
   <note>
 x
 </note>
-  <anchor x="284" y="0" name="bottom"/>
-  <anchor x="283" y="490" name="top"/>
+  <anchor x="282" y="0" name="bottom"/>
+  <anchor x="281" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="-3" y="0" type="line"/>
-      <point x="179" y="0" type="line"/>
-      <point x="300" y="187" type="line"/>
-      <point x="537" y="490" type="line"/>
-      <point x="345" y="490" type="line"/>
-      <point x="236" y="322" type="line"/>
+      <point x="-5" y="0" type="line"/>
+      <point x="177" y="0" type="line"/>
+      <point x="298" y="187" type="line"/>
+      <point x="535" y="490" type="line"/>
+      <point x="343" y="490" type="line"/>
+      <point x="234" y="322" type="line"/>
     </contour>
     <contour>
-      <point x="325" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
-      <point x="299" y="315" type="line"/>
-      <point x="193" y="490" type="line"/>
-      <point x="-6" y="490" type="line"/>
-      <point x="177" y="240" type="line"/>
+      <point x="323" y="0" type="line"/>
+      <point x="521" y="0" type="line"/>
+      <point x="297" y="315" type="line"/>
+      <point x="191" y="490" type="line"/>
+      <point x="-8" y="490" type="line"/>
+      <point x="175" y="240" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/y.glif b/src/Cantarell-Bold.ufo/glyphs/y.glif
index 1b6d58c6..12c2db40 100644
--- a/src/Cantarell-Bold.ufo/glyphs/y.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/y.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="y" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="0079"/>
   <note>
 y
 </note>
-  <anchor x="449" y="0" name="bottom"/>
-  <anchor x="267" y="490" name="top"/>
+  <anchor x="447" y="0" name="bottom"/>
+  <anchor x="265" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="96" y="-217" type="line"/>
-      <point x="284" y="-217" type="line"/>
-      <point x="360" y="0" type="line"/>
-      <point x="545" y="490" type="line"/>
-      <point x="373" y="490" type="line"/>
-      <point x="254" y="88" type="line"/>
-      <point x="296" y="87" type="line"/>
-      <point x="188" y="490" type="line"/>
-      <point x="-3" y="490" type="line"/>
-      <point x="185" y="0" type="line"/>
+      <point x="94" y="-217" type="line"/>
+      <point x="282" y="-217" type="line"/>
+      <point x="358" y="0" type="line"/>
+      <point x="543" y="490" type="line"/>
+      <point x="371" y="490" type="line"/>
+      <point x="252" y="88" type="line"/>
+      <point x="294" y="87" type="line"/>
+      <point x="186" y="490" type="line"/>
+      <point x="-5" y="490" type="line"/>
+      <point x="183" y="0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yacute.glif b/src/Cantarell-Bold.ufo/glyphs/yacute.glif
index d78ad0cf..16fed0f1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yacute.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yacute.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yacute" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="00FD"/>
   <outline>
     <component base="y"/>
-    <component base="acutecomb" xOffset="171"/>
+    <component base="acutecomb" xOffset="169"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif b/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif
index 731ce42d..a0a1b2e1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ycircumflex.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ycircumflex" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="0177"/>
   <outline>
     <component base="y"/>
-    <component base="circumflexcomb" xOffset="64"/>
+    <component base="circumflexcomb" xOffset="62"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ydieresis.glif b/src/Cantarell-Bold.ufo/glyphs/ydieresis.glif
index 09a17467..a1e23aaf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ydieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ydieresis.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydieresis" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="00FF"/>
   <outline>
     <component base="y"/>
-    <component base="dieresiscomb" xOffset="-2"/>
+    <component base="dieresiscomb" xOffset="-4"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ydotaccent.glif b/src/Cantarell-Bold.ufo/glyphs/ydotaccent.glif
index 83472316..81725417 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ydotaccent.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ydotaccent.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotaccent" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="1E8F"/>
   <outline>
     <component base="y"/>
-    <component base="dotaccentcomb" xOffset="123"/>
+    <component base="dotaccentcomb" xOffset="121"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ydotbelow.glif b/src/Cantarell-Bold.ufo/glyphs/ydotbelow.glif
index a8165e6f..9c67039d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ydotbelow.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ydotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ydotbelow" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="1EF5"/>
   <outline>
     <component base="y"/>
-    <component base="dotbelowcomb" xOffset="299"/>
+    <component base="dotbelowcomb" xOffset="297"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ygrave.glif b/src/Cantarell-Bold.ufo/glyphs/ygrave.glif
index 3026543a..4d877009 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ygrave.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ygrave.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ygrave" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="1EF3"/>
   <outline>
     <component base="y"/>
-    <component base="gravecomb" xOffset="69"/>
+    <component base="gravecomb" xOffset="67"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yhookabove.glif b/src/Cantarell-Bold.ufo/glyphs/yhookabove.glif
index ef6571e1..07025b14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yhookabove.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yhookabove" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="1EF7"/>
   <outline>
     <component base="y"/>
-    <component base="hookabovecomb" xOffset="113"/>
+    <component base="hookabovecomb" xOffset="111"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ymacron.glif b/src/Cantarell-Bold.ufo/glyphs/ymacron.glif
index cb50b156..7b4da1ab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ymacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ymacron.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ymacron" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="0233"/>
   <outline>
     <component base="y"/>
-    <component base="macroncomb" xOffset="25"/>
+    <component base="macroncomb" xOffset="23"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ytilde.glif b/src/Cantarell-Bold.ufo/glyphs/ytilde.glif
index e3a00c51..a7139506 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ytilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ytilde.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ytilde" format="2">
-  <advance width="542"/>
+  <advance width="538"/>
   <unicode hex="1EF9"/>
   <outline>
     <component base="y"/>
-    <component base="tildecomb" xOffset="32"/>
+    <component base="tildecomb" xOffset="30"/>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.glif
index aab130fa..dfb84e08 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero" format="2">
-  <advance width="632"/>
+  <advance width="646"/>
   <unicode hex="0030"/>
-  <anchor x="318" y="345" name="slash"/>
+  <anchor x="325" y="345" name="slash"/>
   <outline>
     <contour>
-      <point x="314" y="-10" type="curve" smooth="yes"/>
-      <point x="490" y="-10"/>
-      <point x="609" y="134"/>
-      <point x="609" y="351" type="curve" smooth="yes"/>
-      <point x="609" y="563"/>
-      <point x="492" y="704"/>
-      <point x="319" y="704" type="curve" smooth="yes"/>
-      <point x="142" y="704"/>
-      <point x="23" y="560"/>
-      <point x="23" y="344" type="curve" smooth="yes"/>
-      <point x="23" y="132"/>
-      <point x="140" y="-10"/>
+      <point x="321" y="-10" type="curve" smooth="yes"/>
+      <point x="497" y="-10"/>
+      <point x="616" y="134"/>
+      <point x="616" y="351" type="curve" smooth="yes"/>
+      <point x="616" y="563"/>
+      <point x="499" y="704"/>
+      <point x="326" y="704" type="curve" smooth="yes"/>
+      <point x="149" y="704"/>
+      <point x="30" y="560"/>
+      <point x="30" y="344" type="curve" smooth="yes"/>
+      <point x="30" y="132"/>
+      <point x="147" y="-10"/>
     </contour>
     <contour>
-      <point x="318" y="138" type="curve" smooth="yes"/>
-      <point x="247" y="138"/>
-      <point x="201" y="223"/>
-      <point x="201" y="350" type="curve" smooth="yes"/>
-      <point x="201" y="474"/>
-      <point x="247" y="556"/>
-      <point x="315" y="556" type="curve" smooth="yes"/>
-      <point x="384" y="556"/>
-      <point x="431" y="471"/>
-      <point x="431" y="343" type="curve" smooth="yes"/>
-      <point x="431" y="220"/>
-      <point x="385" y="138"/>
+      <point x="325" y="138" type="curve" smooth="yes"/>
+      <point x="254" y="138"/>
+      <point x="208" y="223"/>
+      <point x="208" y="350" type="curve" smooth="yes"/>
+      <point x="208" y="474"/>
+      <point x="254" y="556"/>
+      <point x="322" y="556" type="curve" smooth="yes"/>
+      <point x="391" y="556"/>
+      <point x="438" y="471"/>
+      <point x="438" y="343" type="curve" smooth="yes"/>
+      <point x="438" y="220"/>
+      <point x="392" y="138"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
index 73691104..2643196c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.tf.zero.glif
@@ -2,7 +2,7 @@
 <glyph name="zero.tf.zero" format="2">
   <advance width="600"/>
   <outline>
-    <component base="zero.tf"/>
+    <component base="zero.tf" xOffset="-7"/>
     <component base="_slash.zero" xOffset="79" yOffset="104"/>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif b/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
index f8e5b746..d7fd9882 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zero.zero.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zero.zero" format="2">
-  <advance width="632"/>
+  <advance width="646"/>
   <outline>
     <component base="zero"/>
-    <component base="_slash.zero" xOffset="95" yOffset="104"/>
+    <component base="_slash.zero" xOffset="102" yOffset="104"/>
   </outline>
   <lib>
     <dict>


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